WIP: testing if DEFINES needs to go in both or in top level

sailfishos · Jun 15, 2020 · d521241 · d521241
1 parent c0f8b0d
commit d521241
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 3 deletions.
diff --git a/common.pri b/common.pri
@@ -0,0 +1 @@
+DEFINES += MTP_PLUGINDIR=\\\"$$[QT_INSTALL_LIBS]/mtp\\\"
diff --git a/mtpserver/mtpserver.pro b/mtpserver/mtpserver.pro
@@ -1,3 +1,4 @@
+include(../common.pri)
 TEMPLATE = lib
 TARGET = mtp-server
 DEPENDPATH += .

diff --git a/mts/mts.pro b/mts/mts.pro
@@ -1,4 +1,5 @@
 include(common.pri)
+include(../common.pri)
 
 QT += xml dbus
 QT -= gui
@@ -7,8 +8,6 @@ LIBS += -lssu
 
 CONFIG += link_pkgconfig debug
 
-DEFINES += MTP_PLUGINDIR=\\\"$$[QT_INSTALL_LIBS]/mtp\\\"
-
 equals(QT_MAJOR_VERSION, 4): {
     CONFIG += mobility
     MOBILITY = systeminfo

diff --git a/mts/platform/storage/fsstorageplugin/unittests/unittests.pro b/mts/platform/storage/fsstorageplugin/unittests/unittests.pro
@@ -1,3 +1,4 @@
+include(../../../../../common.pri)
 include(../../../../common.pri)
 
 CONFIG += warn_off debug_and_release

diff --git a/mts/platform/storage/unittests/unittests.pro b/mts/platform/storage/unittests/unittests.pro
@@ -1,3 +1,4 @@
+include(../../../../common.pri)
 include(../../../common.pri)
 
 TEMPLATE = app

diff --git a/mts/protocol/unittests/unittests.pro b/mts/protocol/unittests/unittests.pro
@@ -1,3 +1,4 @@
+include(../../../common.pri)
 include(../../common.pri)
 
 CONFIG += warn_off debug_and_release

diff --git a/rpm/buteo-mtp-qt5.spec b/rpm/buteo-mtp-qt5.spec
@@ -109,7 +109,7 @@ Conflicts: buteo-mtp-tests
 
 %build
 %qmake5
-make %{_smp_mflags}
+make 
 
 
 %install

diff --git a/test/test.pro b/test/test.pro
@@ -1,3 +1,4 @@
+include(../common.pri)
 TEMPLATE = app
 TARGET = mtp_test
 DEPENDPATH += .