168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using feature files

This commit is contained in:
Uwe Rathmann 2019-04-02 09:07:09 +02:00
parent ba95c58aa2
commit 250cce0d76
42 changed files with 146 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/automotive/automotive.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = automotive
HEADERS += \ HEADERS += \
ButtonBar.h \ ButtonBar.h \

4
examples/boxes/boxes.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = boxes
HEADERS += \ HEADERS += \
Box.h \ Box.h \

5
examples/buttons/buttons.pro
View File

@ -1,7 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample qskqmlexport
include( $${PWD}/../qmlexample.pri )
TARGET = buttons
RESOURCES += \ RESOURCES += \
buttons.qrc buttons.qrc

5
examples/colorswitch/colorswitch.pro
View File

@ -1,7 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample qskqmlexport
include( $${PWD}/../qmlexample.pri )
TARGET = colorswitch
RESOURCES += \ RESOURCES += \
colorswitch.qrc colorswitch.qrc

6
examples/desktop/desktop.pro
View File

@ -1,8 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = desktop
QT += quick
SOURCES += \ SOURCES += \
main.cpp main.cpp

29
examples/example.pri
View File

@ -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
}

5
examples/frames/frames.pro
View File

@ -1,7 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample qskqmlexport
include( $${PWD}/../qmlexample.pri )
TARGET = frames
RESOURCES += \ RESOURCES += \
frames.qrc frames.qrc

4
examples/gbenchmark/gbenchmark.pro
View File

@ -1,9 +1,7 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
QT += svg QT += svg
TARGET = gbenchmark
HEADERS += \ HEADERS += \
Benchmark.h Benchmark.h

5
examples/glabels/glabels.pro
View File

@ -1,7 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample qskqmlexport
include( $${PWD}/../qmlexample.pri )
TARGET = glabels
RESOURCES += \ RESOURCES += \
glabels.qrc glabels.qrc

6
examples/layouts/layouts.pro
View File

@ -1,8 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = layouts
QT += quick
HEADERS += \ HEADERS += \
TestRectangle.h \ TestRectangle.h \

4
examples/listbox/listbox.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = listbox
SOURCES += \ SOURCES += \
main.cpp main.cpp

6
examples/messagebox/messagebox.pro
View File

@ -1,8 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = messagebox
QT += quick
SOURCES += \ SOURCES += \
main.cpp main.cpp

6
examples/messageboxQml/messageboxQml.pro
View File

@ -1,7 +1,5 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
include( $${PWD}/../qmlexample.pri ) CONFIG += qskqmlexport
TARGET = messageboxQml
RESOURCES += \ RESOURCES += \
messagebox.qrc messagebox.qrc

4
examples/mycontrols/mycontrols.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = mycontrols
SOURCES += \ SOURCES += \
MySkin.cpp \ MySkin.cpp \

7
examples/qmlexample.pri
View File

@ -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)

4
examples/qvgviewer/qvgviewer.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = qvgviewer
HEADERS += \ HEADERS += \
MainWindow.h MainWindow.h

4
examples/sliders/sliders.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = sliders
SOURCES += \ SOURCES += \
Slider.cpp \ Slider.cpp \

6
examples/tabview/tabview.pro
View File

@ -1,8 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = tabview
QT += quick
SOURCES += \ SOURCES += \
main.cpp main.cpp

4
examples/thumbnails/thumbnails.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = thumbnails
SOURCES += \ SOURCES += \
main.cpp main.cpp

4
examples/tlabels/tlabels.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../example.pri ) CONFIG += qskexample
TARGET = tlabels
SOURCES += \ SOURCES += \
main.cpp main.cpp

28
features/default_post.prf
View File

@ -1,7 +1,33 @@
load(default_post) load(default_post)
darwin:equals(TEMPLATE, lib) { equals(TEMPLATE, lib) {
plugin {
!isEmpty( QSK_PLUGIN_SUBDIR ) {
DESTDIR = $${QSK_PLUGIN_DIR}/$${QSK_PLUGIN_SUBDIR}
}
darwin {
# Add install name to all libraries, including plugins # Add install name to all libraries, including plugins
LIBS += -Wl,-install_name,@rpath/lib$${TARGET}.dylib 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
}
} }

16
features/default_pre.prf
View File

@ -1,4 +1,20 @@
load(default_pre) 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( qskconfig.pri )
include( qskfunctions.pri ) include( qskfunctions.pri )

6
features/qskexample.prf Normal file
View File

@ -0,0 +1,6 @@
TEMPLATE = app
CONFIG += qskinny qsktestsupport
DESTDIR = $$clean_path( $${OUT_PWD}/../bin )
message( $$TARGET )

16
features/qskinny.prf Normal file
View File

@ -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 )

7
features/qskqmlexport.prf Normal file
View File

@ -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)

7
features/qsktestsupport.prf Normal file
View File

@ -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)

31
inputcontext/inputcontext.pro
View File

@ -1,30 +1,16 @@
QSK_ROOT = $${PWD}/..
QSK_OUT_ROOT = $${OUT_PWD}/..
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qskPluginTarget(qskinputcontext) TARGET = $$qskPluginTarget(qskinputcontext)
QT += quick gui-private QT += gui-private
CONFIG += no_private_qt_headers_warning
# CONFIG += pinyin # CONFIG += pinyin
# CONFIG += hunspell # CONFIG += hunspell
QSK_SUBDIRS = \ CONFIG += plugin
$${QSK_ROOT}/src/common \ CONFIG += qskinny
$${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} QSK_PLUGIN_SUBDIR = platforminputcontexts
DEPENDPATH *= $${QSK_SUBDIRS} contains(QSK_CONFIG, QskDll): DEFINES += QSK_INPUTCONTEXT_MAKEDLL
DESTDIR = $${QSK_OUT_ROOT}/plugins/platforminputcontexts
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
HEADERS += \ HEADERS += \
QskInputContextGlobal.h QskInputContextGlobal.h
@ -65,10 +51,5 @@ hunspell {
} }
contains(QSK_CONFIG, QskDll) { target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR}
DEFINES += QSK_DLL QSK_INPUTCONTEXT_MAKEDLL
}
target.path = $${QSK_INSTALL_PLUGINS}/platforminputcontexts
INSTALLS = target INSTALLS = target

6
playground/dialogbuttons/dialogbuttons.pro
View File

@ -1,8 +1,4 @@
include( $${PWD}/../playground.pri ) CONFIG += qskexample
TARGET = dialogbuttons
QT += quick
HEADERS += \ HEADERS += \
Window.h Window.h

5
playground/images/images.pro
View File

@ -1,7 +1,4 @@
include( $${PWD}/../playground.pri ) CONFIG += qskexample qskqmlexport
include( $${PWD}/../qmlplayground.pri )
TARGET = images
RESOURCES += \ RESOURCES += \
images.qrc images.qrc

4
playground/inputpanel/inputpanel.pro
View File

@ -1,6 +1,4 @@
include( $${PWD}/../playground.pri ) CONFIG += qskexample
TARGET = inputpanel
SOURCES += \ SOURCES += \
main.cpp main.cpp

4
playground/invoker/invoker.pro
View File

@ -1,9 +1,7 @@
include( $${PWD}/../playground.pri ) CONFIG += qskexample
QMAKE_MOC_OPTIONS += -nw # disable warning about missing READ QMAKE_MOC_OPTIONS += -nw # disable warning about missing READ
TARGET = invoker
HEADERS += \ HEADERS += \
Callback.h \ Callback.h \
Invoker.h Invoker.h

31
playground/playground.pri
View File

@ -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
}

8
playground/qmlplayground.pri
View File

@ -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)

5
playground/webview/webview.pro
View File

@ -1,8 +1,5 @@
include( $${PWD}/../playground.pri ) CONFIG += qskexample
QT += webengine webengine-private QT += webengine webengine-private
TARGET = webview
SOURCES += \ SOURCES += \
main.cpp main.cpp

31
qmlexport/qmlexport.pro
View File

@ -1,35 +1,10 @@
QSK_ROOT = $${PWD}/..
QSK_OUT_ROOT = $${OUT_PWD}/..
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qskLibraryTarget(qskqmlexport) TARGET = $$qskLibraryTarget(qskqmlexport)
VERSION = $${QSK_VERSION}
DESTDIR = $${QSK_OUT_ROOT}/lib QT += quick-private
CONFIG += qskinny
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) contains(QSK_CONFIG, QskDll): DEFINES += QSK_QML_MAKEDLL
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}
HEADERS += \ HEADERS += \
QskQmlGlobal.h \ QskQmlGlobal.h \

11
skins/material/material.pro
View File

@ -1,6 +1,11 @@
include( $${PWD}/../skins.pri ) CONFIG += plugin
CONFIG += qskinny
TEMPLATE = lib
QSK_PLUGIN_SUBDIR = skins
TARGET = $$qskPluginTarget(materialskin) TARGET = $$qskPluginTarget(materialskin)
DEFINES += QSK_MATERIAL_MAKEDLL
HEADERS += \ HEADERS += \
QskMaterialGlobal.h \ QskMaterialGlobal.h \
@ -13,4 +18,6 @@ SOURCES += \
OTHER_FILES += metadata.json OTHER_FILES += metadata.json
DEFINES += QSK_MATERIAL_MAKEDLL target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR}
INSTALLS = target

32
skins/skins.pri
View File

@ -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

10
skins/squiek/squiek.pro
View File

@ -1,6 +1,11 @@
include( $${PWD}/../skins.pri ) CONFIG += plugin
CONFIG += qskinny
TEMPLATE = lib
QSK_PLUGIN_SUBDIR = skins
TARGET = $$qskPluginTarget(squiekskin) TARGET = $$qskPluginTarget(squiekskin)
DEFINES += QSK_SQUIEK_MAKEDLL
HEADERS += \ HEADERS += \
QskSquiekGlobal.h \ QskSquiekGlobal.h \
@ -13,4 +18,5 @@ SOURCES += \
OTHER_FILES += metadata.json OTHER_FILES += metadata.json
DEFINES += QSK_SQUIEK_MAKEDLL target.path = $${QSK_INSTALL_PLUGINS}/$${QSK_PLUGIN_SUBDIR}
INSTALLS = target

15
src/src.pro
View File

@ -1,22 +1,9 @@
QSK_ROOT = $${PWD}/..
QSK_OUT_ROOT = $${OUT_PWD}/..
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qskLibraryTarget(qskinny) TARGET = $$qskLibraryTarget(qskinny)
VERSION = $${QSK_VERSION}
DESTDIR = $${QSK_OUT_ROOT}/lib
QT += quick quick-private QT += quick quick-private
contains(QSK_CONFIG, QskDll) { contains(QSK_CONFIG, QskDll): DEFINES += QSK_MAKEDLL
CONFIG += dll
DEFINES += QSK_DLL QSK_MAKEDLL
}
else {
CONFIG += staticlib
}
QSK_SUBDIRS = common graphic nodes controls layouts dialogs inputpanel QSK_SUBDIRS = common graphic nodes controls layouts dialogs inputpanel
INCLUDEPATH *= $${QSK_SUBDIRS} INCLUDEPATH *= $${QSK_SUBDIRS}

30
support/support.pro
View File

@ -1,33 +1,11 @@
QSK_ROOT = $${PWD}/..
QSK_OUT_ROOT = $${OUT_PWD}/..
QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qskLibraryTarget(qsktestsupport) TARGET = $$qskLibraryTarget(qsktestsupport)
DESTDIR = $${QSK_OUT_ROOT}/lib
QT += quick
CONFIG += ensure_skins CONFIG += ensure_skins
CONFIG += fontconfig CONFIG += fontconfig
CONFIG += qskinny
contains(QSK_CONFIG, QskDll) { contains(QSK_CONFIG, QskDll): DEFINES += SKINNY_MAKEDLL
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}
HEADERS += \ HEADERS += \
SkinnyGlobal.h \ SkinnyGlobal.h \
@ -43,9 +21,7 @@ SOURCES += \
SkinnyShapeProvider.cpp \ SkinnyShapeProvider.cpp \
SkinnyShortcut.cpp SkinnyShortcut.cpp
DEFINES += PLUGIN_PATH=$$clean_path( $$QSK_PLUGIN_DIR ) DEFINES += PLUGIN_PATH=$${QSK_PLUGIN_DIR}
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
ensure_skins { ensure_skins {

3
tools/metadoxfilter/metadoxfilter.pro
View File

@ -1,6 +1,3 @@
QSK_ROOT = $${PWD}/../..
QSK_OUT_ROOT = $${OUT_PWD}/../..
TEMPLATE = app TEMPLATE = app
CONFIG -= qt CONFIG -= qt

24
tools/svg2qvg/svg2qvg.pro
View File

@ -1,6 +1,3 @@
QSK_ROOT = $${PWD}/../..
QSK_OUT_ROOT = $${OUT_PWD}/../..
TEMPLATE = app TEMPLATE = app
TARGET = svg2qvg TARGET = svg2qvg
@ -9,13 +6,6 @@ QT += svg
CONFIG += standalone CONFIG += standalone
CONFIG -= app_bundle 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 DESTDIR = $${QSK_OUT_ROOT}/tools/bin
standalone { standalone {
@ -23,16 +13,20 @@ standalone {
# We only need a very small subset of QSkinny and by including the # We only need a very small subset of QSkinny and by including the
# necessary cpp files svg2qvg becomes independent from the library # 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 DEFINES += QSK_STANDALONE
QSK_CONFIG -= QskDll
} }
else { else {
qskAddLibrary( $${QSK_OUT_ROOT}/lib, qskinny ) CONFIG += qskinny
contains(QSK_CONFIG, QskDll) {
DEFINES += QSK_DLL
}
} }
SOURCES += \ SOURCES += \