using feature files

uwerat · Apr 2, 2019 · 250cce0 · 250cce0
1 parent ba95c58
commit 250cce0
Show file tree

Hide file tree

Showing 42 changed files with 146 additions and 314 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-
-INCLUDEPATH *= $${QSK_SUBDIRS}
-DEPENDPATH  *= $${QSK_SUBDIRS}
-
-DESTDIR      = $${QSK_OUT_ROOT}/plugins/platforminputcontexts
+CONFIG += plugin
+CONFIG += qskinny
 
-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
@@ -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
@@ -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
@@ -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
@@ -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