- adjusted qtlockedfile.prf for qt5 compatibility; release 5

diff --git a/QtLockedFile.spec b/QtLockedFile.spec
index e193a1204d266763c44884e7ceefc13e845d271c..3260ebdbfbfdf8ff0b79e4c72b5524618642a483 100644 (file)
--- a/QtLockedFile.spec
+++ b/QtLockedFile.spec
@@ -10,7 +10,7 @@ Summary:      QFile extension with advisory locking functions
 Summary(pl.UTF-8):     Rozszerzenie QFile z funkcjami do blokowania doradczego
 Name:          QtLockedFile
 Version:       2.4
-Release:       4
+Release:       5
 License:       GPL v3 or LGPL v2 with exceptions
 Group:         Libraries
 # git clone git@gitorious.org:qt-solutions/qt-solutions.git
@@ -154,7 +154,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{qt4dir}/mkspecs/features
 install -d $RPM_BUILD_ROOT{%{_includedir}/qt5/QtSolutions,%{qt5dir}/mkspecs/features}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-%{version}.so.1.0
 cp -p src/qtlockedfile.h src/QtLockedFile $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
-%{__sed} -e 's/-lQtSolutions/-lQt5Solutions/' %{SOURCE1} >$RPM_BUILD_ROOT%{qt5dir}/mkspecs/features/qtlockedfile.prf
+%{__sed} -e 's/-lQtSolutions/-lQt5Solutions/' \
+        -e 's/QMAKE_INCDIR_QT/QT_MODULE_INCLUDE_BASE/' %{SOURCE1} >$RPM_BUILD_ROOT%{qt5dir}/mkspecs/features/qtlockedfile.prf
 %endif
 
 %clean

diff --git a/qtlockedfile.prf b/qtlockedfile.prf
index 970db04e7fe8e7e3990843ec5ff9334e9becfe32..4696367aa044dab5efad0808744a6cdb3dafbec1 100644 (file)
--- a/qtlockedfile.prf
+++ b/qtlockedfile.prf
@@ -1,3 +1,3 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH  *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+DEPENDPATH  *= $$[QT_INSTALL_HEADERS]/QtSolutions
 LIBS *= -lQtSolutions_LockedFile-2.4