code related to QML access moved to an extra library: qmlexport

This commit is contained in:
Uwe Rathmann 2018-10-04 10:23:28 +02:00
parent 894b2707b1
commit 6db5105fdc
15 changed files with 64 additions and 6 deletions

View File

@ -1,4 +1,5 @@
include( $${PWD}/../example.pri ) include( $${PWD}/../example.pri )
include( $${PWD}/../qmlexample.pri )
TARGET = buttons TARGET = buttons

View File

@ -1,4 +1,5 @@
include( $${PWD}/../example.pri ) include( $${PWD}/../example.pri )
include( $${PWD}/../qmlexample.pri )
TARGET = colorswitch TARGET = colorswitch

View File

@ -1,4 +1,5 @@
include( $${PWD}/../example.pri ) include( $${PWD}/../example.pri )
include( $${PWD}/../qmlexample.pri )
TARGET = frames TARGET = frames

View File

@ -1,4 +1,5 @@
include( $${PWD}/../example.pri ) include( $${PWD}/../example.pri )
include( $${PWD}/../qmlexample.pri )
TARGET = glabels TARGET = glabels

View File

@ -1,4 +1,5 @@
include( $${PWD}/../example.pri ) include( $${PWD}/../example.pri )
include( $${PWD}/../qmlexample.pri )
TARGET = messageboxQml TARGET = messageboxQml

7
examples/qmlexample.pri Normal file
View File

@ -0,0 +1,7 @@
QSK_ROOT = $${PWD}/..
INCLUDEPATH *= $${QSK_ROOT}/qmlexport
DEPENDPATH *= $${QSK_ROOT}/qmlexport
LIBS *= -lqskqmlexport

View File

@ -1,4 +1,5 @@
include( $${PWD}/../playground.pri ) include( $${PWD}/../playground.pri )
include( $${PWD}/../qmlplayground.pri )
TARGET = images TARGET = images

View File

@ -0,0 +1,7 @@
QSK_ROOT = $${PWD}/..
INCLUDEPATH *= $${QSK_ROOT}/qmlexport
DEPENDPATH *= $${QSK_ROOT}/qmlexport
LIBS *= -lqskqmlexport

41
qmlexport/qmlexport.pro Normal file
View File

@ -0,0 +1,41 @@
QSK_ROOT = $${PWD}/..
QSK_OUT_ROOT = $${OUT_PWD}/..
include( $${QSK_ROOT}/qskconfig.pri )
TEMPLATE = lib
TARGET = qskqmlexport
DESTDIR = $${QSK_OUT_ROOT}/lib
QT += quick quick-private
CONFIG += no_private_qt_headers_warning
contains(QSK_CONFIG, QskDll) {
CONFIG += dll
DEFINES += QSK_DLL QSK_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 += \
QskShortcut.h \
QskModule.h
SOURCES += \
QskModule.cpp \
QskShortcut.cpp

View File

@ -6,6 +6,7 @@ SUBDIRS = \
src \ src \
skins \ skins \
inputcontext \ inputcontext \
qmlexport \
tools \ tools \
support \ support \
examples \ examples \
@ -23,5 +24,5 @@ inputcontext.depends = src
skins.depends = src skins.depends = src
tools.depends = src tools.depends = src
support.depends = skins support.depends = skins
examples.depends = tools support skins examples.depends = tools support skins qmlexport
playground.depends = tools support skins playground.depends = tools support skins qmlexport

View File

@ -43,7 +43,6 @@ HEADERS += \
common/QskMetaFunction.h \ common/QskMetaFunction.h \
common/QskMetaFunction.hpp \ common/QskMetaFunction.hpp \
common/QskMetaInvokable.h \ common/QskMetaInvokable.h \
common/QskModule.h \
common/QskNamespace.h \ common/QskNamespace.h \
common/QskObjectCounter.h \ common/QskObjectCounter.h \
common/QskSizePolicy.h \ common/QskSizePolicy.h \
@ -61,7 +60,6 @@ SOURCES += \
common/QskMargins.cpp \ common/QskMargins.cpp \
common/QskMetaFunction.cpp \ common/QskMetaFunction.cpp \
common/QskMetaInvokable.cpp \ common/QskMetaInvokable.cpp \
common/QskModule.cpp \
common/QskObjectCounter.cpp \ common/QskObjectCounter.cpp \
common/QskSizePolicy.cpp \ common/QskSizePolicy.cpp \
common/QskTextColors.cpp \ common/QskTextColors.cpp \
@ -155,7 +153,6 @@ HEADERS += \
controls/QskSeparator.h \ controls/QskSeparator.h \
controls/QskSeparatorSkinlet.h \ controls/QskSeparatorSkinlet.h \
controls/QskSetup.h \ controls/QskSetup.h \
controls/QskShortcut.h \
controls/QskShortcutMap.h \ controls/QskShortcutMap.h \
controls/QskSimpleListBox.h \ controls/QskSimpleListBox.h \
controls/QskSkin.h \ controls/QskSkin.h \
@ -221,7 +218,6 @@ SOURCES += \
controls/QskSeparator.cpp \ controls/QskSeparator.cpp \
controls/QskSeparatorSkinlet.cpp \ controls/QskSeparatorSkinlet.cpp \
controls/QskSetup.cpp \ controls/QskSetup.cpp \
controls/QskShortcut.cpp \
controls/QskShortcutMap.cpp \ controls/QskShortcutMap.cpp \
controls/QskSimpleListBox.cpp \ controls/QskSimpleListBox.cpp \
controls/QskSkin.cpp \ controls/QskSkin.cpp \