diff --git a/examples/buttons/buttons.pro b/examples/buttons/buttons.pro index 48cc5c4b..70578581 100644 --- a/examples/buttons/buttons.pro +++ b/examples/buttons/buttons.pro @@ -1,4 +1,5 @@ include( $${PWD}/../example.pri ) +include( $${PWD}/../qmlexample.pri ) TARGET = buttons diff --git a/examples/colorswitch/colorswitch.pro b/examples/colorswitch/colorswitch.pro index 652daa6b..f87a78a2 100644 --- a/examples/colorswitch/colorswitch.pro +++ b/examples/colorswitch/colorswitch.pro @@ -1,4 +1,5 @@ include( $${PWD}/../example.pri ) +include( $${PWD}/../qmlexample.pri ) TARGET = colorswitch diff --git a/examples/frames/frames.pro b/examples/frames/frames.pro index aa6523b8..6fdee65a 100644 --- a/examples/frames/frames.pro +++ b/examples/frames/frames.pro @@ -1,4 +1,5 @@ include( $${PWD}/../example.pri ) +include( $${PWD}/../qmlexample.pri ) TARGET = frames diff --git a/examples/glabels/glabels.pro b/examples/glabels/glabels.pro index b83a2399..03d9a34a 100644 --- a/examples/glabels/glabels.pro +++ b/examples/glabels/glabels.pro @@ -1,4 +1,5 @@ include( $${PWD}/../example.pri ) +include( $${PWD}/../qmlexample.pri ) TARGET = glabels diff --git a/examples/messageboxQml/messageboxQml.pro b/examples/messageboxQml/messageboxQml.pro index f316321e..e5391605 100644 --- a/examples/messageboxQml/messageboxQml.pro +++ b/examples/messageboxQml/messageboxQml.pro @@ -1,4 +1,5 @@ include( $${PWD}/../example.pri ) +include( $${PWD}/../qmlexample.pri ) TARGET = messageboxQml diff --git a/examples/qmlexample.pri b/examples/qmlexample.pri new file mode 100644 index 00000000..e4df7c05 --- /dev/null +++ b/examples/qmlexample.pri @@ -0,0 +1,7 @@ +QSK_ROOT = $${PWD}/.. + +INCLUDEPATH *= $${QSK_ROOT}/qmlexport +DEPENDPATH *= $${QSK_ROOT}/qmlexport + +LIBS *= -lqskqmlexport + diff --git a/playground/images/images.pro b/playground/images/images.pro index c2b0b8bf..3dc6a3fe 100644 --- a/playground/images/images.pro +++ b/playground/images/images.pro @@ -1,4 +1,5 @@ include( $${PWD}/../playground.pri ) +include( $${PWD}/../qmlplayground.pri ) TARGET = images diff --git a/playground/qmlplayground.pri b/playground/qmlplayground.pri new file mode 100644 index 00000000..e4df7c05 --- /dev/null +++ b/playground/qmlplayground.pri @@ -0,0 +1,7 @@ +QSK_ROOT = $${PWD}/.. + +INCLUDEPATH *= $${QSK_ROOT}/qmlexport +DEPENDPATH *= $${QSK_ROOT}/qmlexport + +LIBS *= -lqskqmlexport + diff --git a/src/common/QskModule.cpp b/qmlexport/QskModule.cpp similarity index 100% rename from src/common/QskModule.cpp rename to qmlexport/QskModule.cpp diff --git a/src/common/QskModule.h b/qmlexport/QskModule.h similarity index 100% rename from src/common/QskModule.h rename to qmlexport/QskModule.h diff --git a/src/controls/QskShortcut.cpp b/qmlexport/QskShortcut.cpp similarity index 100% rename from src/controls/QskShortcut.cpp rename to qmlexport/QskShortcut.cpp diff --git a/src/controls/QskShortcut.h b/qmlexport/QskShortcut.h similarity index 100% rename from src/controls/QskShortcut.h rename to qmlexport/QskShortcut.h diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro new file mode 100644 index 00000000..2c4b2413 --- /dev/null +++ b/qmlexport/qmlexport.pro @@ -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 + diff --git a/qskinny.pro b/qskinny.pro index 7276264d..4e536038 100644 --- a/qskinny.pro +++ b/qskinny.pro @@ -6,6 +6,7 @@ SUBDIRS = \ src \ skins \ inputcontext \ + qmlexport \ tools \ support \ examples \ @@ -23,5 +24,5 @@ inputcontext.depends = src skins.depends = src tools.depends = src support.depends = skins -examples.depends = tools support skins -playground.depends = tools support skins +examples.depends = tools support skins qmlexport +playground.depends = tools support skins qmlexport diff --git a/src/src.pro b/src/src.pro index 16ffdc8d..4ca2b354 100644 --- a/src/src.pro +++ b/src/src.pro @@ -43,7 +43,6 @@ HEADERS += \ common/QskMetaFunction.h \ common/QskMetaFunction.hpp \ common/QskMetaInvokable.h \ - common/QskModule.h \ common/QskNamespace.h \ common/QskObjectCounter.h \ common/QskSizePolicy.h \ @@ -61,7 +60,6 @@ SOURCES += \ common/QskMargins.cpp \ common/QskMetaFunction.cpp \ common/QskMetaInvokable.cpp \ - common/QskModule.cpp \ common/QskObjectCounter.cpp \ common/QskSizePolicy.cpp \ common/QskTextColors.cpp \ @@ -155,7 +153,6 @@ HEADERS += \ controls/QskSeparator.h \ controls/QskSeparatorSkinlet.h \ controls/QskSetup.h \ - controls/QskShortcut.h \ controls/QskShortcutMap.h \ controls/QskSimpleListBox.h \ controls/QskSkin.h \ @@ -221,7 +218,6 @@ SOURCES += \ controls/QskSeparator.cpp \ controls/QskSeparatorSkinlet.cpp \ controls/QskSetup.cpp \ - controls/QskShortcut.cpp \ controls/QskShortcutMap.cpp \ controls/QskSimpleListBox.cpp \ controls/QskSkin.cpp \