Merge branch 'jb49681' into 'master'

Use qmake properties instead of hardcoded paths. See merge request mer-core/libresourceqt!7
sailfishos · May 27, 2020 · 8228f98 · 8228f98
2 parents cd0ce5a + 28bf20f
commit 8228f98
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 32 deletions.
diff --git a/libdbus-qeventloop/libdbus-qeventloop.pro b/libdbus-qeventloop/libdbus-qeventloop.pro
@@ -38,8 +38,8 @@ DEFINES    += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT QT_NO_DEBUG_STREAM
 
 # Install directives
 headers.files  = $$HEADERS
-INSTALLBASE    = /usr
-target.path    = $$INSTALLBASE/lib
+INSTALLBASE    = $$[QT_INSTALL_PREFIX]
+target.path    = $$[QT_INSTALL_LIBS]
 headers.path   = $$INSTALLBASE/include
 
 QMAKE_PKGCONFIG_NAME = libdbus-qeventloop5

diff --git a/libmediaoverridesqt/libmediaoverridesqt.pro b/libmediaoverridesqt/libmediaoverridesqt.pro
@@ -26,8 +26,8 @@ QMAKE_DISTCLEAN += -r moc build
 
 # Install directives
 headers.files  = $${PUBLIC_HEADERS}
-INSTALLBASE    = /usr
-target.path    = $${INSTALLBASE}/lib
+INSTALLBASE    = $$[QT_INSTALL_PREFIX]
+target.path    = $$[QT_INSTALL_LIBS]
 headers.path   = $${INSTALLBASE}/include/resource/qt5/policy
 
 QMAKE_PKGCONFIG_NAME = libmediaoverridesqt5

diff --git a/libresourceqt/libresourceqt.pro b/libresourceqt/libresourceqt.pro
@@ -53,8 +53,8 @@ PKGCONFIG += dbus-1 libresource
 
 # Install directives
 headers.files  = $${PUBLIC_HEADERS}
-INSTALLBASE    = /usr
-target.path    = $${INSTALLBASE}/lib
+INSTALLBASE    = $$[QT_INSTALL_PREFIX]
+target.path    = $$[QT_INSTALL_LIBS]
 headers.path   = $${INSTALLBASE}/include/resource/qt5/policy
 
 man.files      = docs/man

diff --git a/tests/benchmark-resource-set/benchmark-resource-set.pro b/tests/benchmark-resource-set/benchmark-resource-set.pro
@@ -42,5 +42,5 @@ QT -= gui
 QT += testlib
 PKGCONFIG += dbus-1 libresource
 
-target.path = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-acquire/test-acquire.pro b/tests/test-acquire/test-acquire.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-always-reply/test-always-reply.pro b/tests/test-always-reply/test-always-reply.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-audio-resource/test-audio-resource.pro b/tests/test-audio-resource/test-audio-resource.pro
@@ -37,5 +37,5 @@ CONFIG  += qt debug warn_on
 QT += testlib
 QT -= gui
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-auto-release/test-auto-release.pro b/tests/test-auto-release/test-auto-release.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-init-and-connect/test-init-and-connect.pro b/tests/test-init-and-connect/test-init-and-connect.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-looping/test-looping.pro b/tests/test-looping/test-looping.pro
@@ -42,5 +42,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-memory-leaks/test-memory-leaks.pro b/tests/test-memory-leaks/test-memory-leaks.pro
@@ -40,6 +40,5 @@ QT -= gui
 PKGCONFIG += dbus-1 libresource
 
 # Install directives
-INSTALLBASE    = /usr
-target.path    = $${INSTALLBASE}/lib/libresourceqt-tests/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-released-by-manager/test-released-by-manager.pro b/tests/test-released-by-manager/test-released-by-manager.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-resource-engine/test-resource-engine.pro b/tests/test-resource-engine/test-resource-engine.pro
@@ -52,10 +52,8 @@ QT -= gui
 PKGCONFIG += dbus-1
 
 # Install directives
-INSTALLBASE    = /usr
-target.path    = $${INSTALLBASE}/lib/libresourceqt-tests/
-
-wrapper.path  = $${INSTALLBASE}/lib/libresourceqt-tests/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
+wrapper.path  = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 wrapper.files = test-resource-engine-wrapper
 
 INSTALLS       = target wrapper
diff --git a/tests/test-resource-set/test-resource-set.pro b/tests/test-resource-set/test-resource-set.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-resource/test-resource.pro b/tests/test-resource/test-resource.pro
@@ -36,5 +36,5 @@ CONFIG  += qt debug warn_on
 QT += testlib
 QT -= gui
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-security-with-aegis-token/test-security-with-aegis-token.pro b/tests/test-security-with-aegis-token/test-security-with-aegis-token.pro
@@ -33,7 +33,6 @@ SOURCES += test-security.cpp
 LIBS += -L$${LIBDBUSQEVENTLOOP}/build -L$${LIBRESOURCEQT}/build -ldbus-qeventloop -lresourceqt
 
 # Install options
-target.path   = /usr/lib/libresourceqt-tests/
-#target.files  = test-security-with-aegis-token 
+target.path   = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 
 INSTALLS      = target
diff --git a/tests/test-security-without-aegis-token/test-security-without-aegis-token.pro b/tests/test-security-without-aegis-token/test-security-without-aegis-token.pro
@@ -33,9 +33,7 @@ SOURCES += test-security.cpp
 LIBS += -L$${LIBDBUSQEVENTLOOP}/build -L$${LIBRESOURCEQT}/build -ldbus-qeventloop -lresourceqt
 
 # Install options
-# Install options
-target.path   = /usr/lib/libresourceqt-tests/
-#target.files  = test-security-without-aegis-token 
+target.path   = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 
 INSTALLS      = target
 
diff --git a/tests/test-update/test-update.pro b/tests/test-update/test-update.pro
@@ -39,5 +39,5 @@ QT += testlib
 QT -= gui
 PKGCONFIG += dbus-1 libresource
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test-video-resource/test-video-resource.pro b/tests/test-video-resource/test-video-resource.pro
@@ -37,5 +37,5 @@ CONFIG  += qt debug warn_on
 QT += testlib
 QT -= gui
 
-target.path    = $${INSTALLBASE}/lib/$${TESTSTARGETDIR}/
+target.path    = $$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}/
 INSTALLS       = target
diff --git a/tests/test_common.pri b/tests/test_common.pri
@@ -6,5 +6,3 @@ LIBS += $$DBUSQEVENTLOOPLIB
 INCLUDEPATH += $$PUBLIC_INCLUDE
 
 TESTSTARGETDIR = libresourceqt-qt5-tests
-
-INSTALLBASE = /usr
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -41,7 +41,7 @@ unix{
     testsxml.files    = tests.xml
     testsxml.target   = tests.xml
     testsxml.CONFIG   = no_check_exist
-    testsxml.commands = sed \'s%@PATH@%/usr/lib/$${TESTSTARGETDIR}%\' $$PWD/tests.xml.in > $$PWD/tests.xml
+    testsxml.commands = sed \'s%@PATH@%$$[QT_INSTALL_LIBS]/$${TESTSTARGETDIR}%\' $$PWD/tests.xml.in > $$PWD/tests.xml
 
     QMAKE_DISTCLEAN += tests.xml
 }