diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 00000000..d1ede79b --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +QMAKEFEATURES=$$PWD/features diff --git a/examples/example.pri b/examples/example.pri index 221f9952..9229472e 100644 --- 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 diff --git a/examples/examples.pro b/examples/examples.pro index 87f09799..65133f81 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,3 @@ -include( $${PWD}/../qskconfig.pri ) - TEMPLATE = subdirs # c++ diff --git a/features/default_post.prf b/features/default_post.prf new file mode 100644 index 00000000..50de9df4 --- /dev/null +++ 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 +} + diff --git a/features/default_pre.prf b/features/default_pre.prf new file mode 100644 index 00000000..c8b8b32b --- /dev/null +++ b/features/default_pre.prf @@ -0,0 +1,4 @@ +load(default_pre) + +include( qskconfig.pri ) +include( qskfunctions.pri ) diff --git a/qskconfig.pri b/features/qskconfig.pri similarity index 100% rename from qskconfig.pri rename to features/qskconfig.pri diff --git a/qskfunctions.pri b/features/qskfunctions.pri similarity index 100% rename from qskfunctions.pri rename to features/qskfunctions.pri diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro index f54c30a2..9d984462 100644 --- 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) diff --git a/playground/playground.pri b/playground/playground.pri index 8e615476..6d23ef5c 100644 --- 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 diff --git a/playground/playground.pro b/playground/playground.pro index c7f0415b..e0aff6d8 100644 --- a/playground/playground.pro +++ b/playground/playground.pro @@ -1,5 +1,3 @@ -include( $${PWD}/../qskconfig.pri ) - TEMPLATE = subdirs SUBDIRS += \ diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro index 04d73ed5..7c2a40c5 100644 --- 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} diff --git a/qskinny.pro b/qskinny.pro index 6bafa9bc..97705c65 100644 --- a/qskinny.pro +++ b/qskinny.pro @@ -1,5 +1,3 @@ -include( qskconfig.pri ) - TEMPLATE = subdirs SUBDIRS = \ diff --git a/skins/skins.pri b/skins/skins.pri index afdb2514..71abfcda 100644 --- 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 diff --git a/skins/skins.pro b/skins/skins.pro index 285fd4bc..42e5f9bb 100644 --- a/skins/skins.pro +++ b/skins/skins.pro @@ -1,5 +1,3 @@ -include( $${PWD}/../qskconfig.pri ) - TEMPLATE = subdirs SUBDIRS += \ diff --git a/src/src.pro b/src/src.pro index c52a7a67..55e0c408 100644 --- 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} diff --git a/support/support.pro b/support/support.pro index fe392f42..fe516c2d 100644 --- 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) diff --git a/tools/metadoxfilter/metadoxfilter.pro b/tools/metadoxfilter/metadoxfilter.pro index 5cd7368d..6de13c8f 100644 --- 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 diff --git a/tools/svg2qvg/svg2qvg.pro b/tools/svg2qvg/svg2qvg.pro index 82d05df6..36526120 100644 --- 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 diff --git a/tools/tools.pro b/tools/tools.pro index 67095927..19cc6bcb 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,5 +1,3 @@ -include( $${PWD}/../qskconfig.pri ) - TEMPLATE = subdirs qtHaveModule(svg) {