project file include mechanism based on QMAKEFEATURES

2019-03-31 13:05:25 +02:00 · 2019-03-31 13:05:25 +02:00 · 7cbe60f5fc
commit 7cbe60f5fc
parent 3d80322afe
19 changed files with 12 additions and 38 deletions
--- a/.qmake.conf
+++ b/.qmake.conf
@ -0,0 +1 @@
+QMAKEFEATURES=$$PWD/features
--- a/examples/example.pri
+++ b/examples/example.pri
@ -1,8 +1,4 @@
 QSK_ROOT = $${PWD}/..
-
-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 QSK_OUT_ROOT = $${OUT_PWD}/../..

 QT += quick
--- a/examples/examples.pro
+++ b/examples/examples.pro
@ -1,5 +1,3 @@
-include( $${PWD}/../qskconfig.pri )
-
 TEMPLATE = subdirs

 # c++
--- a/features/default_post.prf
+++ b/features/default_post.prf
@ -0,0 +1,7 @@
+load(default_post)
+
+darwin:equals(TEMPLATE, lib) {
+    # Add install name to all libraries, including plugins
+    LIBS += -Wl,-install_name,@rpath/lib$${TARGET}.dylib
+}
+
--- a/features/default_pre.prf
+++ b/features/default_pre.prf
@ -0,0 +1,4 @@
+load(default_pre)
+
+include( qskconfig.pri )
+include( qskfunctions.pri )
--- a/features/qskconfig.pri
+++ b/features/qskconfig.pri
--- a/features/qskfunctions.pri
+++ b/features/qskfunctions.pri
--- a/inputcontext/inputcontext.pro
+++ b/inputcontext/inputcontext.pro
@ -1,9 +1,6 @@
 QSK_ROOT = $${PWD}/..
 QSK_OUT_ROOT = $${OUT_PWD}/..

-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 TEMPLATE = lib
 TARGET = $$qskPluginTarget(qskinputcontext)

--- a/playground/playground.pri
+++ b/playground/playground.pri
@ -1,8 +1,4 @@
 QSK_ROOT = $${PWD}/..
-
-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 QSK_OUT_ROOT = $${OUT_PWD}/../..

 QT += quick
--- a/playground/playground.pro
+++ b/playground/playground.pro
@ -1,5 +1,3 @@
-include( $${PWD}/../qskconfig.pri )
-
 TEMPLATE = subdirs

 SUBDIRS += \
--- a/qmlexport/qmlexport.pro
+++ b/qmlexport/qmlexport.pro
@ -1,9 +1,6 @@
 QSK_ROOT = $${PWD}/..
 QSK_OUT_ROOT = $${OUT_PWD}/..

-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 TEMPLATE = lib
 TARGET   = $$qskLibraryTarget(qskqmlexport)
 VERSION  = $${QSK_VERSION}
--- a/qskinny.pro
+++ b/qskinny.pro
@ -1,5 +1,3 @@
-include( qskconfig.pri )
-
 TEMPLATE = subdirs

 SUBDIRS = \
--- a/skins/skins.pri
+++ b/skins/skins.pri
@ -1,8 +1,4 @@
 QSK_ROOT = $${PWD}/..
-
-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 QSK_OUT_ROOT = $${OUT_PWD}/../..

 CONFIG         += plugin
--- a/skins/skins.pro
+++ b/skins/skins.pro
@ -1,5 +1,3 @@
-include( $${PWD}/../qskconfig.pri )
-
 TEMPLATE = subdirs

 SUBDIRS += \
--- a/src/src.pro
+++ b/src/src.pro
@ -1,9 +1,6 @@
 QSK_ROOT = $${PWD}/..
 QSK_OUT_ROOT = $${OUT_PWD}/..

-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 TEMPLATE = lib
 TARGET   = $$qskLibraryTarget(qskinny)
 VERSION  = $${QSK_VERSION}
--- a/support/support.pro
+++ b/support/support.pro
@ -2,9 +2,6 @@ QSK_ROOT = $${PWD}/..
 QSK_OUT_ROOT = $${OUT_PWD}/..
 QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins

-include( $${QSK_ROOT}/qskconfig.pri )
-include( $${QSK_ROOT}/qskfunctions.pri )
-
 TEMPLATE = lib
 TARGET   = $$qskLibraryTarget(qsktestsupport)

--- a/tools/metadoxfilter/metadoxfilter.pro
+++ b/tools/metadoxfilter/metadoxfilter.pro
@ -1,6 +1,4 @@
 QSK_ROOT = $${PWD}/../..
-include( $${QSK_ROOT}/qskconfig.pri )
-
 QSK_OUT_ROOT = $${OUT_PWD}/../..

 TEMPLATE     = app
--- a/tools/svg2qvg/svg2qvg.pro
+++ b/tools/svg2qvg/svg2qvg.pro
@ -1,6 +1,4 @@
 QSK_ROOT = $${PWD}/../..
-include( $${QSK_ROOT}/qskconfig.pri )
-
 QSK_OUT_ROOT = $${OUT_PWD}/../..

 TEMPLATE     = app
--- a/tools/tools.pro
+++ b/tools/tools.pro
@ -1,5 +1,3 @@
-include( $${PWD}/../qskconfig.pri )
-
 TEMPLATE = subdirs

 qtHaveModule(svg) {