From e3a07d8ccaa1889a79ddbeeaeecb1dc3649bd3e7 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 24 Jul 2017 07:47:09 +0200 Subject: [PATCH] Experimental and unfinished QskImage/QskLineEdit classes moved to a new playground area --- .../images/Image.cpp | 0 .../QskImage.h => playground/images/Image.h | 0 {examples => playground}/images/images.pro | 0 {examples => playground}/images/images.qml | 0 {examples => playground}/images/images.qrc | 0 {examples => playground}/images/main.cpp | 0 .../lineedit/LineEdit.cpp | 0 .../lineedit/LineEdit.h | 0 .../lineedit/LineEditSkinlet.cpp | 0 .../lineedit/LineEditSkinlet.h | 0 .../lineedit/lineedit.pro | 0 .../lineedit/lineedit.qml | 0 {examples => playground}/lineedit/main.cpp | 0 {examples => playground}/lineedit/qml.qrc | 0 playground/playground.pri | 35 +++++++++++++++++++ playground/playground.pro | 8 +++++ 16 files changed, 43 insertions(+) rename src/controls/QskImage.cpp => playground/images/Image.cpp (100%) rename src/controls/QskImage.h => playground/images/Image.h (100%) rename {examples => playground}/images/images.pro (100%) rename {examples => playground}/images/images.qml (100%) rename {examples => playground}/images/images.qrc (100%) rename {examples => playground}/images/main.cpp (100%) rename src/controls/QskLineEdit.cpp => playground/lineedit/LineEdit.cpp (100%) rename src/controls/QskLineEdit.h => playground/lineedit/LineEdit.h (100%) rename src/controls/QskLineEditSkinlet.cpp => playground/lineedit/LineEditSkinlet.cpp (100%) rename src/controls/QskLineEditSkinlet.h => playground/lineedit/LineEditSkinlet.h (100%) rename {examples => playground}/lineedit/lineedit.pro (100%) rename {examples => playground}/lineedit/lineedit.qml (100%) rename {examples => playground}/lineedit/main.cpp (100%) rename {examples => playground}/lineedit/qml.qrc (100%) create mode 100644 playground/playground.pri create mode 100644 playground/playground.pro diff --git a/src/controls/QskImage.cpp b/playground/images/Image.cpp similarity index 100% rename from src/controls/QskImage.cpp rename to playground/images/Image.cpp diff --git a/src/controls/QskImage.h b/playground/images/Image.h similarity index 100% rename from src/controls/QskImage.h rename to playground/images/Image.h diff --git a/examples/images/images.pro b/playground/images/images.pro similarity index 100% rename from examples/images/images.pro rename to playground/images/images.pro diff --git a/examples/images/images.qml b/playground/images/images.qml similarity index 100% rename from examples/images/images.qml rename to playground/images/images.qml diff --git a/examples/images/images.qrc b/playground/images/images.qrc similarity index 100% rename from examples/images/images.qrc rename to playground/images/images.qrc diff --git a/examples/images/main.cpp b/playground/images/main.cpp similarity index 100% rename from examples/images/main.cpp rename to playground/images/main.cpp diff --git a/src/controls/QskLineEdit.cpp b/playground/lineedit/LineEdit.cpp similarity index 100% rename from src/controls/QskLineEdit.cpp rename to playground/lineedit/LineEdit.cpp diff --git a/src/controls/QskLineEdit.h b/playground/lineedit/LineEdit.h similarity index 100% rename from src/controls/QskLineEdit.h rename to playground/lineedit/LineEdit.h diff --git a/src/controls/QskLineEditSkinlet.cpp b/playground/lineedit/LineEditSkinlet.cpp similarity index 100% rename from src/controls/QskLineEditSkinlet.cpp rename to playground/lineedit/LineEditSkinlet.cpp diff --git a/src/controls/QskLineEditSkinlet.h b/playground/lineedit/LineEditSkinlet.h similarity index 100% rename from src/controls/QskLineEditSkinlet.h rename to playground/lineedit/LineEditSkinlet.h diff --git a/examples/lineedit/lineedit.pro b/playground/lineedit/lineedit.pro similarity index 100% rename from examples/lineedit/lineedit.pro rename to playground/lineedit/lineedit.pro diff --git a/examples/lineedit/lineedit.qml b/playground/lineedit/lineedit.qml similarity index 100% rename from examples/lineedit/lineedit.qml rename to playground/lineedit/lineedit.qml diff --git a/examples/lineedit/main.cpp b/playground/lineedit/main.cpp similarity index 100% rename from examples/lineedit/main.cpp rename to playground/lineedit/main.cpp diff --git a/examples/lineedit/qml.qrc b/playground/lineedit/qml.qrc similarity index 100% rename from examples/lineedit/qml.qrc rename to playground/lineedit/qml.qrc diff --git a/playground/playground.pri b/playground/playground.pri new file mode 100644 index 00000000..7e8da8d2 --- /dev/null +++ b/playground/playground.pri @@ -0,0 +1,35 @@ +QSK_ROOT = $${PWD}/.. +include( $${QSK_ROOT}/qskconfig.pri ) + +QSK_OUT_ROOT = $${OUT_PWD}/../.. + +QT += quick +QT += quick 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/skins \ + $${QSK_ROOT}/support + +INCLUDEPATH *= $${QSK_DIRS} +DEPENDPATH += $${QSK_DIRS} + +DESTDIR = $${QSK_OUT_ROOT}/examples/bin + +QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib +LIBS *= -L$${QSK_OUT_ROOT}/lib -lqsktestsupport -lqskinny + +win32 { + contains(QSK_CONFIG, QskDll) { + DEFINES += QT_DLL QSK_DLL QSK_DLL + } +} + diff --git a/playground/playground.pro b/playground/playground.pro new file mode 100644 index 00000000..c2a0c178 --- /dev/null +++ b/playground/playground.pro @@ -0,0 +1,8 @@ +include( $${PWD}/../qskconfig.pri ) + +TEMPLATE = subdirs + +# qml +SUBDIRS += \ + lineedit \ + images