From 80c41c53e0e85bf585a6d4de1301ce2c3c37e816 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 6 Apr 2018 11:27:10 +0200 Subject: [PATCH] inputpanel subdir introduced --- examples/examples.pri | 1 + inputcontext/inputcontext.pro | 3 ++- playground/playground.pri | 1 + skins/skins.pri | 3 ++- src/{controls => inputpanel}/QskVirtualKeyboard.cpp | 0 src/{controls => inputpanel}/QskVirtualKeyboard.h | 0 .../QskVirtualKeyboardLayouts.cpp | 0 src/src.pro | 10 +++++++--- 8 files changed, 13 insertions(+), 5 deletions(-) rename src/{controls => inputpanel}/QskVirtualKeyboard.cpp (100%) rename src/{controls => inputpanel}/QskVirtualKeyboard.h (100%) rename src/{controls => inputpanel}/QskVirtualKeyboardLayouts.cpp (100%) diff --git a/examples/examples.pri b/examples/examples.pri index 7ffb5d35..9057d578 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -14,6 +14,7 @@ QSK_DIRS = \ $${QSK_ROOT}/src/controls \ $${QSK_ROOT}/src/layouts \ $${QSK_ROOT}/src/dialogs \ + $${QSK_ROOT}/src/inputpanel \ $${QSK_ROOT}/support INCLUDEPATH *= $${QSK_DIRS} diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro index 472493c2..51c26a2d 100644 --- a/inputcontext/inputcontext.pro +++ b/inputcontext/inputcontext.pro @@ -21,7 +21,8 @@ QSK_SUBDIRS = \ $${QSK_ROOT}/src/graphic \ $${QSK_ROOT}/src/controls \ $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs + $${QSK_ROOT}/src/dialogs \ + $${QSK_ROOT}/src/inputpanel INCLUDEPATH *= $${QSK_SUBDIRS} DEPENDPATH *= $${QSK_SUBDIRS} diff --git a/playground/playground.pri b/playground/playground.pri index cf93dcc8..a454e8d4 100644 --- a/playground/playground.pri +++ b/playground/playground.pri @@ -16,6 +16,7 @@ QSK_DIRS = \ $${QSK_ROOT}/src/controls \ $${QSK_ROOT}/src/layouts \ $${QSK_ROOT}/src/dialogs \ + $${QSK_ROOT}/src/inputpanel \ $${QSK_ROOT}/support INCLUDEPATH *= $${QSK_DIRS} diff --git a/skins/skins.pri b/skins/skins.pri index 9b9915b5..e8f0c168 100644 --- a/skins/skins.pri +++ b/skins/skins.pri @@ -15,7 +15,8 @@ QSK_DIRS = \ $${QSK_ROOT}/src/graphic \ $${QSK_ROOT}/src/controls \ $${QSK_ROOT}/src/layouts \ - $${QSK_ROOT}/src/dialogs + $${QSK_ROOT}/src/dialogs \ + $${QSK_ROOT}/src/inputpanel INCLUDEPATH *= $${QSK_DIRS} DEPENDPATH += $${QSK_DIRS} diff --git a/src/controls/QskVirtualKeyboard.cpp b/src/inputpanel/QskVirtualKeyboard.cpp similarity index 100% rename from src/controls/QskVirtualKeyboard.cpp rename to src/inputpanel/QskVirtualKeyboard.cpp diff --git a/src/controls/QskVirtualKeyboard.h b/src/inputpanel/QskVirtualKeyboard.h similarity index 100% rename from src/controls/QskVirtualKeyboard.h rename to src/inputpanel/QskVirtualKeyboard.h diff --git a/src/controls/QskVirtualKeyboardLayouts.cpp b/src/inputpanel/QskVirtualKeyboardLayouts.cpp similarity index 100% rename from src/controls/QskVirtualKeyboardLayouts.cpp rename to src/inputpanel/QskVirtualKeyboardLayouts.cpp diff --git a/src/src.pro b/src/src.pro index 8838b433..eca3b48b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -25,7 +25,7 @@ else { CONFIG += staticlib } -QSK_SUBDIRS = common graphic nodes controls layouts dialogs +QSK_SUBDIRS = common graphic nodes controls layouts dialogs inputpanel INCLUDEPATH *= $${QSK_SUBDIRS} DEPENDPATH *= $${QSK_SUBDIRS} @@ -182,7 +182,6 @@ HEADERS += \ controls/QskTextLabel.h \ controls/QskTextLabelSkinlet.h \ controls/QskVariantAnimator.h \ - controls/QskVirtualKeyboard.h \ controls/QskWindow.h SOURCES += \ @@ -248,7 +247,6 @@ SOURCES += \ controls/QskTextLabel.cpp \ controls/QskTextLabelSkinlet.cpp \ controls/QskVariantAnimator.cpp \ - controls/QskVirtualKeyboard.cpp \ controls/QskWindow.cpp HEADERS += \ @@ -298,3 +296,9 @@ SOURCES += \ dialogs/QskMessageWindow.cpp \ dialogs/QskSelectionSubWindow.cpp \ dialogs/QskSelectionWindow.cpp + +SOURCES += \ + inputpanel/QskVirtualKeyboard.cpp + +HEADERS += \ + inputpanel/QskVirtualKeyboard.h