From 250cce0d7634127d3964768885707ca947c5d52f Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 2 Apr 2019 09:07:09 +0200 Subject: [PATCH] using feature files --- examples/automotive/automotive.pro | 4 +-- examples/boxes/boxes.pro | 4 +-- examples/buttons/buttons.pro | 5 +--- examples/colorswitch/colorswitch.pro | 5 +--- examples/desktop/desktop.pro | 6 +--- examples/example.pri | 29 ------------------ examples/frames/frames.pro | 5 +--- examples/gbenchmark/gbenchmark.pro | 4 +-- examples/glabels/glabels.pro | 5 +--- examples/layouts/layouts.pro | 6 +--- examples/listbox/listbox.pro | 4 +-- examples/messagebox/messagebox.pro | 6 +--- examples/messageboxQml/messageboxQml.pro | 6 ++-- examples/mycontrols/mycontrols.pro | 4 +-- examples/qmlexample.pri | 7 ----- examples/qvgviewer/qvgviewer.pro | 4 +-- examples/sliders/sliders.pro | 4 +-- examples/tabview/tabview.pro | 6 +--- examples/thumbnails/thumbnails.pro | 4 +-- examples/tlabels/tlabels.pro | 4 +-- features/default_post.prf | 32 ++++++++++++++++++-- features/default_pre.prf | 16 ++++++++++ features/qskexample.prf | 6 ++++ features/qskinny.prf | 16 ++++++++++ features/qskqmlexport.prf | 7 +++++ features/qsktestsupport.prf | 7 +++++ inputcontext/inputcontext.pro | 31 ++++--------------- playground/dialogbuttons/dialogbuttons.pro | 6 +--- playground/images/images.pro | 5 +--- playground/inputpanel/inputpanel.pro | 4 +-- playground/invoker/invoker.pro | 4 +-- playground/playground.pri | 31 ------------------- playground/qmlplayground.pri | 8 ----- playground/webview/webview.pro | 5 +--- qmlexport/qmlexport.pro | 35 ++++------------------ skins/material/material.pro | 11 +++++-- skins/skins.pri | 32 -------------------- skins/squiek/squiek.pro | 10 +++++-- src/src.pro | 15 +--------- support/support.pro | 30 ++----------------- tools/metadoxfilter/metadoxfilter.pro | 3 -- tools/svg2qvg/svg2qvg.pro | 24 ++++++--------- 42 files changed, 146 insertions(+), 314 deletions(-) delete mode 100644 examples/example.pri delete mode 100644 examples/qmlexample.pri create mode 100644 features/qskexample.prf create mode 100644 features/qskinny.prf create mode 100644 features/qskqmlexport.prf create mode 100644 features/qsktestsupport.prf delete mode 100644 playground/playground.pri delete mode 100644 playground/qmlplayground.pri delete mode 100644 skins/skins.pri diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro index f641c3da..b6939e84 100644 --- a/examples/automotive/automotive.pro +++ b/examples/automotive/automotive.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = automotive +CONFIG += qskexample HEADERS += \ ButtonBar.h \ diff --git a/examples/boxes/boxes.pro b/examples/boxes/boxes.pro index 6f52bb12..0b2e1534 100644 --- a/examples/boxes/boxes.pro +++ b/examples/boxes/boxes.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = boxes +CONFIG += qskexample HEADERS += \ Box.h \ diff --git a/examples/buttons/buttons.pro b/examples/buttons/buttons.pro index 70578581..c8fe49fb 100644 --- a/examples/buttons/buttons.pro +++ b/examples/buttons/buttons.pro @@ -1,7 +1,4 @@ -include( $${PWD}/../example.pri ) -include( $${PWD}/../qmlexample.pri ) - -TARGET = buttons +CONFIG += qskexample qskqmlexport RESOURCES += \ buttons.qrc diff --git a/examples/colorswitch/colorswitch.pro b/examples/colorswitch/colorswitch.pro index f87a78a2..e6da7676 100644 --- a/examples/colorswitch/colorswitch.pro +++ b/examples/colorswitch/colorswitch.pro @@ -1,7 +1,4 @@ -include( $${PWD}/../example.pri ) -include( $${PWD}/../qmlexample.pri ) - -TARGET = colorswitch +CONFIG += qskexample qskqmlexport RESOURCES += \ colorswitch.qrc diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro index 6b0788f9..0a7f08c9 100644 --- a/examples/desktop/desktop.pro +++ b/examples/desktop/desktop.pro @@ -1,8 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = desktop - -QT += quick +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/examples/example.pri b/examples/example.pri deleted file mode 100644 index fdaffa74..00000000 --- a/examples/example.pri +++ /dev/null @@ -1,29 +0,0 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/../.. - -QT += quick - -TEMPLATE = app - -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/nodes \ - $${QSK_ROOT}/src/graphic \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs \ - $${QSK_ROOT}/src/inputpanel \ - $${QSK_ROOT}/support - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH *= $${QSK_DIRS} - -DESTDIR = $${QSK_OUT_ROOT}/examples/bin - -QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) - -contains(QSK_CONFIG, QskDll) { - DEFINES += QSK_DLL -} diff --git a/examples/frames/frames.pro b/examples/frames/frames.pro index 6fdee65a..7286be02 100644 --- a/examples/frames/frames.pro +++ b/examples/frames/frames.pro @@ -1,7 +1,4 @@ -include( $${PWD}/../example.pri ) -include( $${PWD}/../qmlexample.pri ) - -TARGET = frames +CONFIG += qskexample qskqmlexport RESOURCES += \ frames.qrc diff --git a/examples/gbenchmark/gbenchmark.pro b/examples/gbenchmark/gbenchmark.pro index 7a8ae326..850763cf 100644 --- a/examples/gbenchmark/gbenchmark.pro +++ b/examples/gbenchmark/gbenchmark.pro @@ -1,9 +1,7 @@ -include( $${PWD}/../example.pri ) +CONFIG += qskexample QT += svg -TARGET = gbenchmark - HEADERS += \ Benchmark.h diff --git a/examples/glabels/glabels.pro b/examples/glabels/glabels.pro index 03d9a34a..b453e68d 100644 --- a/examples/glabels/glabels.pro +++ b/examples/glabels/glabels.pro @@ -1,7 +1,4 @@ -include( $${PWD}/../example.pri ) -include( $${PWD}/../qmlexample.pri ) - -TARGET = glabels +CONFIG += qskexample qskqmlexport RESOURCES += \ glabels.qrc diff --git a/examples/layouts/layouts.pro b/examples/layouts/layouts.pro index 8a1ad8d4..38f7e869 100644 --- a/examples/layouts/layouts.pro +++ b/examples/layouts/layouts.pro @@ -1,8 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = layouts - -QT += quick +CONFIG += qskexample HEADERS += \ TestRectangle.h \ diff --git a/examples/listbox/listbox.pro b/examples/listbox/listbox.pro index 8920c512..0a7f08c9 100644 --- a/examples/listbox/listbox.pro +++ b/examples/listbox/listbox.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = listbox +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/examples/messagebox/messagebox.pro b/examples/messagebox/messagebox.pro index 5b3917a0..0a7f08c9 100644 --- a/examples/messagebox/messagebox.pro +++ b/examples/messagebox/messagebox.pro @@ -1,8 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = messagebox - -QT += quick +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/examples/messageboxQml/messageboxQml.pro b/examples/messageboxQml/messageboxQml.pro index e5391605..bdcd2d9b 100644 --- a/examples/messageboxQml/messageboxQml.pro +++ b/examples/messageboxQml/messageboxQml.pro @@ -1,7 +1,5 @@ -include( $${PWD}/../example.pri ) -include( $${PWD}/../qmlexample.pri ) - -TARGET = messageboxQml +CONFIG += qskexample +CONFIG += qskqmlexport RESOURCES += \ messagebox.qrc diff --git a/examples/mycontrols/mycontrols.pro b/examples/mycontrols/mycontrols.pro index 05bd8f08..ac6892b5 100644 --- a/examples/mycontrols/mycontrols.pro +++ b/examples/mycontrols/mycontrols.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = mycontrols +CONFIG += qskexample SOURCES += \ MySkin.cpp \ diff --git a/examples/qmlexample.pri b/examples/qmlexample.pri deleted file mode 100644 index d134f009..00000000 --- a/examples/qmlexample.pri +++ /dev/null @@ -1,7 +0,0 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. - -INCLUDEPATH *= $${QSK_ROOT}/qmlexport -DEPENDPATH *= $${QSK_ROOT}/qmlexport - -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskqmlexport) diff --git a/examples/qvgviewer/qvgviewer.pro b/examples/qvgviewer/qvgviewer.pro index f06ebbdb..1a3d2596 100644 --- a/examples/qvgviewer/qvgviewer.pro +++ b/examples/qvgviewer/qvgviewer.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = qvgviewer +CONFIG += qskexample HEADERS += \ MainWindow.h diff --git a/examples/sliders/sliders.pro b/examples/sliders/sliders.pro index 21036cf0..303ff4f8 100644 --- a/examples/sliders/sliders.pro +++ b/examples/sliders/sliders.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = sliders +CONFIG += qskexample SOURCES += \ Slider.cpp \ diff --git a/examples/tabview/tabview.pro b/examples/tabview/tabview.pro index 87d4c676..0a7f08c9 100644 --- a/examples/tabview/tabview.pro +++ b/examples/tabview/tabview.pro @@ -1,8 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = tabview - -QT += quick +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/examples/thumbnails/thumbnails.pro b/examples/thumbnails/thumbnails.pro index 6182f1a9..0a7f08c9 100644 --- a/examples/thumbnails/thumbnails.pro +++ b/examples/thumbnails/thumbnails.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = thumbnails +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/examples/tlabels/tlabels.pro b/examples/tlabels/tlabels.pro index 071c2510..0a7f08c9 100644 --- a/examples/tlabels/tlabels.pro +++ b/examples/tlabels/tlabels.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../example.pri ) - -TARGET = tlabels +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/features/default_post.prf b/features/default_post.prf index 50de9df4..2414260d 100644 --- a/features/default_post.prf +++ b/features/default_post.prf @@ -1,7 +1,33 @@ load(default_post) -darwin:equals(TEMPLATE, lib) { - # Add install name to all libraries, including plugins - LIBS += -Wl,-install_name,@rpath/lib$${TARGET}.dylib +equals(TEMPLATE, lib) { + + plugin { + + !isEmpty( QSK_PLUGIN_SUBDIR ) { + + DESTDIR = $${QSK_PLUGIN_DIR}/$${QSK_PLUGIN_SUBDIR} + } + + darwin { + # Add install name to all libraries, including plugins + LIBS += -Wl,-install_name,@rpath/lib$${TARGET}.dylib + } + } + else { + + DESTDIR = $${QSK_LIB_DIR} + } + + VERSION = $${QSK_VERSION} + + contains(QSK_CONFIG, QskDll) { + + CONFIG += dll + DEFINES += QSK_DLL + } + else { + CONFIG += staticlib + } } diff --git a/features/default_pre.prf b/features/default_pre.prf index c8b8b32b..d9f64801 100644 --- a/features/default_pre.prf +++ b/features/default_pre.prf @@ -1,4 +1,20 @@ load(default_pre) +QSK_ROOT = $$clean_path( $$PWD/.. ) + +equals( QSK_ROOT, $$_PRO_FILE_PWD_ ) { + + QSK_SUB_DIR = "." + QSK_OUT_ROOT = $$OUT_PWD +} +else { + + QSK_SUB_DIR = $$relative_path( $$_PRO_FILE_PWD_, $$QSK_ROOT ) + QSK_OUT_ROOT = $$replace( OUT_PWD, /$$QSK_SUB_DIR, "" ) +} + +QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins +QSK_LIB_DIR = $${QSK_OUT_ROOT}/lib + include( qskconfig.pri ) include( qskfunctions.pri ) diff --git a/features/qskexample.prf b/features/qskexample.prf new file mode 100644 index 00000000..9a48357a --- /dev/null +++ b/features/qskexample.prf @@ -0,0 +1,6 @@ +TEMPLATE = app +CONFIG += qskinny qsktestsupport + +DESTDIR = $$clean_path( $${OUT_PWD}/../bin ) + +message( $$TARGET ) diff --git a/features/qskinny.prf b/features/qskinny.prf new file mode 100644 index 00000000..41e3ca4b --- /dev/null +++ b/features/qskinny.prf @@ -0,0 +1,16 @@ +QT *= quick + +QSK_DIRS = \ + $${QSK_ROOT}/src/common \ + $${QSK_ROOT}/src/controls \ + $${QSK_ROOT}/src/dialogs \ + $${QSK_ROOT}/src/graphic \ + $${QSK_ROOT}/src/inputpanel \ + $${QSK_ROOT}/src/layouts \ + $${QSK_ROOT}/src/nodes + +INCLUDEPATH *= $${QSK_DIRS} +DEPENDPATH *= $${QSK_DIRS} + +QMAKE_RPATHDIR *= $${QSK_LIB_DIR} +qskAddLibrary( $${QSK_LIB_DIR}, qskinny ) diff --git a/features/qskqmlexport.prf b/features/qskqmlexport.prf new file mode 100644 index 00000000..8b1b707e --- /dev/null +++ b/features/qskqmlexport.prf @@ -0,0 +1,7 @@ +QSK_QML_EXPORT_DIRS = $${QSK_ROOT}/qmlexport + +INCLUDEPATH *= $${QSK_QML_EXPORT_DIRS} +DEPENDPATH *= $${QSK_QML_EXPORT_DIRS} + +QMAKE_RPATHDIR *= $${QSK_LIB_DIR} +qskAddLibrary( $${QSK_LIB_DIR}, qskqmlexport) diff --git a/features/qsktestsupport.prf b/features/qsktestsupport.prf new file mode 100644 index 00000000..9d03f232 --- /dev/null +++ b/features/qsktestsupport.prf @@ -0,0 +1,7 @@ +QSK_TEST_SUPPORT_DIRS = $${QSK_ROOT}/support + +INCLUDEPATH *= $${QSK_TEST_SUPPORT_DIRS} +DEPENDPATH *= $${QSK_TEST_SUPPORT_DIRS} + +QMAKE_RPATHDIR *= $${QSK_LIB_DIR} +qskAddLibrary( $${QSK_LIB_DIR}, qsktestsupport) diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro index 2f9c3cd0..29b210a8 100644 --- a/inputcontext/inputcontext.pro +++ b/inputcontext/inputcontext.pro @@ -1,30 +1,16 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. - TEMPLATE = lib TARGET = $$qskPluginTarget(qskinputcontext) -QT += quick gui-private -CONFIG += no_private_qt_headers_warning +QT += gui-private # CONFIG += pinyin # CONFIG += hunspell -QSK_SUBDIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/nodes \ - $${QSK_ROOT}/src/graphic \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs \ - $${QSK_ROOT}/src/inputpanel +CONFIG += plugin +CONFIG += qskinny -INCLUDEPATH *= $${QSK_SUBDIRS} -DEPENDPATH *= $${QSK_SUBDIRS} - -DESTDIR = $${QSK_OUT_ROOT}/plugins/platforminputcontexts - -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) +QSK_PLUGIN_SUBDIR = platforminputcontexts +contains(QSK_CONFIG, QskDll): DEFINES += QSK_INPUTCONTEXT_MAKEDLL HEADERS += \ QskInputContextGlobal.h @@ -65,10 +51,5 @@ hunspell { } -contains(QSK_CONFIG, QskDll) { - DEFINES += QSK_DLL QSK_INPUTCONTEXT_MAKEDLL -} - -target.path = $${QSK_INSTALL_PLUGINS}/platforminputcontexts +target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR} INSTALLS = target - diff --git a/playground/dialogbuttons/dialogbuttons.pro b/playground/dialogbuttons/dialogbuttons.pro index 1261ec61..94614da0 100644 --- a/playground/dialogbuttons/dialogbuttons.pro +++ b/playground/dialogbuttons/dialogbuttons.pro @@ -1,8 +1,4 @@ -include( $${PWD}/../playground.pri ) - -TARGET = dialogbuttons - -QT += quick +CONFIG += qskexample HEADERS += \ Window.h diff --git a/playground/images/images.pro b/playground/images/images.pro index 3dc6a3fe..f75ae767 100644 --- a/playground/images/images.pro +++ b/playground/images/images.pro @@ -1,7 +1,4 @@ -include( $${PWD}/../playground.pri ) -include( $${PWD}/../qmlplayground.pri ) - -TARGET = images +CONFIG += qskexample qskqmlexport RESOURCES += \ images.qrc diff --git a/playground/inputpanel/inputpanel.pro b/playground/inputpanel/inputpanel.pro index a3bb0c0d..0a7f08c9 100644 --- a/playground/inputpanel/inputpanel.pro +++ b/playground/inputpanel/inputpanel.pro @@ -1,6 +1,4 @@ -include( $${PWD}/../playground.pri ) - -TARGET = inputpanel +CONFIG += qskexample SOURCES += \ main.cpp diff --git a/playground/invoker/invoker.pro b/playground/invoker/invoker.pro index a5175491..80f517d6 100644 --- a/playground/invoker/invoker.pro +++ b/playground/invoker/invoker.pro @@ -1,9 +1,7 @@ -include( $${PWD}/../playground.pri ) +CONFIG += qskexample QMAKE_MOC_OPTIONS += -nw # disable warning about missing READ -TARGET = invoker - HEADERS += \ Callback.h \ Invoker.h diff --git a/playground/playground.pri b/playground/playground.pri deleted file mode 100644 index 72204ff4..00000000 --- a/playground/playground.pri +++ /dev/null @@ -1,31 +0,0 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/../.. - -QT += quick -QT += quick-private -CONFIG += no_private_qt_headers_warning - -TEMPLATE = app - -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/nodes \ - $${QSK_ROOT}/src/graphic \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs \ - $${QSK_ROOT}/src/inputpanel \ - $${QSK_ROOT}/support - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH += $${QSK_DIRS} - -DESTDIR = $${QSK_OUT_ROOT}/playground/bin - -QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) - -contains(QSK_CONFIG, QskDll) { - DEFINES += QSK_DLL -} diff --git a/playground/qmlplayground.pri b/playground/qmlplayground.pri deleted file mode 100644 index 14e02a87..00000000 --- a/playground/qmlplayground.pri +++ /dev/null @@ -1,8 +0,0 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. - -INCLUDEPATH *= $${QSK_ROOT}/qmlexport -DEPENDPATH *= $${QSK_ROOT}/qmlexport - -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskqmlexport) - diff --git a/playground/webview/webview.pro b/playground/webview/webview.pro index 18244191..4df11229 100644 --- a/playground/webview/webview.pro +++ b/playground/webview/webview.pro @@ -1,8 +1,5 @@ -include( $${PWD}/../playground.pri ) - +CONFIG += qskexample QT += webengine webengine-private -TARGET = webview - SOURCES += \ main.cpp diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro index 173059d7..dac0bb6d 100644 --- a/qmlexport/qmlexport.pro +++ b/qmlexport/qmlexport.pro @@ -1,35 +1,10 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. - TEMPLATE = lib TARGET = $$qskLibraryTarget(qskqmlexport) -VERSION = $${QSK_VERSION} -DESTDIR = $${QSK_OUT_ROOT}/lib +QT += quick-private +CONFIG += qskinny -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) - -QT += quick quick-private - -contains(QSK_CONFIG, QskDll) { - - CONFIG += dll - DEFINES += QSK_DLL QSK_QML_MAKEDLL -} -else { - CONFIG += staticlib -} - -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/dialogs \ - $${QSK_ROOT}/src/inputpanel \ - $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/graphic - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH *= $${QSK_DIRS} +contains(QSK_CONFIG, QskDll): DEFINES += QSK_QML_MAKEDLL HEADERS += \ QskQmlGlobal.h \ @@ -40,5 +15,5 @@ SOURCES += \ QskShortcut.cpp \ QskQml.cpp -target.path = $${QSK_INSTALL_LIBS} -INSTALLS = target +target.path = $${QSK_INSTALL_LIBS} +INSTALLS = target diff --git a/skins/material/material.pro b/skins/material/material.pro index 01635244..c1259315 100644 --- a/skins/material/material.pro +++ b/skins/material/material.pro @@ -1,6 +1,11 @@ -include( $${PWD}/../skins.pri ) +CONFIG += plugin +CONFIG += qskinny + +TEMPLATE = lib +QSK_PLUGIN_SUBDIR = skins TARGET = $$qskPluginTarget(materialskin) +DEFINES += QSK_MATERIAL_MAKEDLL HEADERS += \ QskMaterialGlobal.h \ @@ -13,4 +18,6 @@ SOURCES += \ OTHER_FILES += metadata.json -DEFINES += QSK_MATERIAL_MAKEDLL +target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR} +INSTALLS = target + diff --git a/skins/skins.pri b/skins/skins.pri deleted file mode 100644 index ebb63f42..00000000 --- a/skins/skins.pri +++ /dev/null @@ -1,32 +0,0 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/../.. - -CONFIG += plugin - -QT += quick - -TEMPLATE = lib -VERSION = $${QSK_VERSION} - -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/nodes \ - $${QSK_ROOT}/src/graphic \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs \ - $${QSK_ROOT}/src/inputpanel - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH += $${QSK_DIRS} - -DESTDIR = $${QSK_OUT_ROOT}/plugins/skins - -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) - -contains(QSK_CONFIG, QskDll) { - DEFINES += QSK_DLL -} - -target.path = $${QSK_INSTALL_PLUGINS}/skins -INSTALLS = target diff --git a/skins/squiek/squiek.pro b/skins/squiek/squiek.pro index cebaaf89..95e05fd4 100644 --- a/skins/squiek/squiek.pro +++ b/skins/squiek/squiek.pro @@ -1,6 +1,11 @@ -include( $${PWD}/../skins.pri ) +CONFIG += plugin +CONFIG += qskinny + +TEMPLATE = lib +QSK_PLUGIN_SUBDIR = skins TARGET = $$qskPluginTarget(squiekskin) +DEFINES += QSK_SQUIEK_MAKEDLL HEADERS += \ QskSquiekGlobal.h \ @@ -13,4 +18,5 @@ SOURCES += \ OTHER_FILES += metadata.json -DEFINES += QSK_SQUIEK_MAKEDLL +target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR} +INSTALLS = target diff --git a/src/src.pro b/src/src.pro index 6fdcada8..8df07b29 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,22 +1,9 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. - TEMPLATE = lib TARGET = $$qskLibraryTarget(qskinny) -VERSION = $${QSK_VERSION} - -DESTDIR = $${QSK_OUT_ROOT}/lib QT += quick quick-private -contains(QSK_CONFIG, QskDll) { - - CONFIG += dll - DEFINES += QSK_DLL QSK_MAKEDLL -} -else { - CONFIG += staticlib -} +contains(QSK_CONFIG, QskDll): DEFINES += QSK_MAKEDLL QSK_SUBDIRS = common graphic nodes controls layouts dialogs inputpanel INCLUDEPATH *= $${QSK_SUBDIRS} diff --git a/support/support.pro b/support/support.pro index fe516c2d..f1315168 100644 --- a/support/support.pro +++ b/support/support.pro @@ -1,33 +1,11 @@ -QSK_ROOT = $${PWD}/.. -QSK_OUT_ROOT = $${OUT_PWD}/.. -QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins - TEMPLATE = lib TARGET = $$qskLibraryTarget(qsktestsupport) -DESTDIR = $${QSK_OUT_ROOT}/lib - -QT += quick - CONFIG += ensure_skins CONFIG += fontconfig +CONFIG += qskinny -contains(QSK_CONFIG, QskDll) { - - CONFIG += dll - DEFINES += QSK_DLL SKINNY_MAKEDLL -} -else { - CONFIG += staticlib -} - -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/controls \ - $${QSK_ROOT}/src/graphic - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH *= $${QSK_DIRS} +contains(QSK_CONFIG, QskDll): DEFINES += SKINNY_MAKEDLL HEADERS += \ SkinnyGlobal.h \ @@ -43,9 +21,7 @@ SOURCES += \ SkinnyShapeProvider.cpp \ SkinnyShortcut.cpp -DEFINES += PLUGIN_PATH=$$clean_path( $$QSK_PLUGIN_DIR ) - -qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) +DEFINES += PLUGIN_PATH=$${QSK_PLUGIN_DIR} ensure_skins { diff --git a/tools/metadoxfilter/metadoxfilter.pro b/tools/metadoxfilter/metadoxfilter.pro index 6de13c8f..c1dedbb4 100644 --- a/tools/metadoxfilter/metadoxfilter.pro +++ b/tools/metadoxfilter/metadoxfilter.pro @@ -1,6 +1,3 @@ -QSK_ROOT = $${PWD}/../.. -QSK_OUT_ROOT = $${OUT_PWD}/../.. - TEMPLATE = app CONFIG -= qt diff --git a/tools/svg2qvg/svg2qvg.pro b/tools/svg2qvg/svg2qvg.pro index 827a2ce1..e09367e5 100644 --- a/tools/svg2qvg/svg2qvg.pro +++ b/tools/svg2qvg/svg2qvg.pro @@ -1,6 +1,3 @@ -QSK_ROOT = $${PWD}/../.. -QSK_OUT_ROOT = $${OUT_PWD}/../.. - TEMPLATE = app TARGET = svg2qvg @@ -9,13 +6,6 @@ QT += svg CONFIG += standalone CONFIG -= app_bundle -QSK_DIRS = \ - $${QSK_ROOT}/src/common \ - $${QSK_ROOT}/src/graphic - -INCLUDEPATH *= $${QSK_DIRS} -DEPENDPATH += $${QSK_DIRS} - DESTDIR = $${QSK_OUT_ROOT}/tools/bin standalone { @@ -23,16 +13,20 @@ standalone { # We only need a very small subset of QSkinny and by including the # necessary cpp files svg2qvg becomes independent from the library + QSK_DIRS = \ + $${QSK_ROOT}/src/common \ + $${QSK_ROOT}/src/graphic + + INCLUDEPATH *= $${QSK_DIRS} + DEPENDPATH += $${QSK_DIRS} + DEFINES += QSK_STANDALONE + QSK_CONFIG -= QskDll } else { - qskAddLibrary( $${QSK_OUT_ROOT}/lib, qskinny ) - - contains(QSK_CONFIG, QskDll) { - DEFINES += QSK_DLL - } + CONFIG += qskinny } SOURCES += \