Rearrange the file system layout

uitk2.pri → imports/controls/ubuntu/cpp/cpp.pri

@@ -1,3 +1,5 @@
+INCLUDEPATH+=$$PWD
+
 SOURCES += \
     $$PWD/ubuntustyle.cpp \
     $$PWD/ubuntutheme.cpp \
@@ -14,18 +16,3 @@ HEADERS += \
     $$PWD/ubuntunumberanimation_p.h \
     $$PWD/themeiconprovider_p.h \
     $$PWD/palettevalues_p.h
-
-QML_UBUNTU_FILES = \
-    $$PWD/Icon.qml
-
-QML_FILES += \
-    $$QML_UBUNTU_FILES \
-    $$PWD/BusyIndicator.qml \
-    $$PWD/Button.qml \
-    $$PWD/CheckBox.qml
-
-# yet
-OTHER_FILES += QML_FILES
-
-RESOURCES += \
-    $$PWD/uitk2.qrc

palettevalues.cpp → imports/controls/ubuntu/cpp/palettevalues.cpp

@@ -41,6 +41,7 @@ void SuruNormal::lightColors()
     m_colors[Field] = UbuntuStyle::color(UbuntuStyle::White);
     m_colors[FieldText] = UbuntuStyle::color(UbuntuStyle::Jet);
     m_colors[Focus] = UbuntuStyle::color(UbuntuStyle::Blue);
+
     m_colors[FocusText] = UbuntuStyle::color(UbuntuStyle::White);
     m_colors[Selection] = UbuntuStyle::color(UbuntuStyle::Blue, 0.2);
     m_colors[SelectionText] = UbuntuStyle::color(UbuntuStyle::Jet);

imports/controls/ubuntu/qml.pri

@@ -0,0 +1,11 @@
+QML_UBUNTU_FILES = \
+    $$PWD/Icon.qml
+
+QML_FILES += \
+    $$QML_UBUNTU_FILES \
+    $$PWD/BusyIndicator.qml \
+    $$PWD/Button.qml \
+    $$PWD/CheckBox.qml
+
+# yet
+OTHER_FILES += QML_FILES

imports/controls/ubuntu/ubuntu.pro

@@ -0,0 +1,43 @@
+TEMPLATE = lib
+TARGET = uitk2styleplugin
+TARGETPATH = QtQuick/Controls.2/Ubuntu
+IMPORT_VERSION = 2.0
+uri = QtQuick.Controls.Ubuntu
+
+QT += qml quick
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+OTHER_FILES += \
+    $$PWD/qmldir
+
+SOURCES += \
+    $$PWD/cpp/uitk2_plugin.cpp
+
+HEADERS += \
+    $$PWD/cpp/uitk2_plugin.h
+
+RESOURCES += \
+    $$PWD/uitk2.qrc
+
+include(qml.pri)
+include(cpp/cpp.pri)
+
+#DISTFILES += \
+#    uitk2.pri
+
+qmldir.files = qmldir
+qmlfiles.file = $$QML_FILES
+
+
+CONFIG += no_cxx_module
+load(qml_plugin)
+
+#unix {
+#    installPath = $$[QT_INSTALL_QML]/$${TARGETPATH}
+#    qmldir.path = $$installPath
+#    qmlfiles.path = $$installPath
+#    target.path = $$installPath
+#    #INSTALLS += target qmldir
+#}

imports/imports.pro

@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += controls/ubuntu

uitk2.pro

@@ -1,40 +1,2 @@
-TEMPLATE = lib
-TARGET = uitk2styleplugin
-TARGETPATH = QtQuick/Controls.2/Ubuntu
-IMPORT_VERSION = 2.0
-uri = QtQuick.Controls.Ubuntu
-
-QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-OTHER_FILES += \
-    $$PWD/qmldir
-
-SOURCES += \
-    $$PWD/uitk2_plugin.cpp
-
-HEADERS += \
-    $$PWD/uitk2_plugin.h
-
-#RESOURCES += \
-#    $$PWD/uitk2_plugin.qrc
-
-include(uitk2.pri)
-
-DISTFILES += \
-    uitk2.pri
-
-qmldir.files = qmldir
-qmlfiles.file = $$QML_FILES
-unix {
-    installPath = $$[QT_INSTALL_QML]/$${TARGETPATH}
-    qmldir.path = $$installPath
-    qmlfiles.path = $$installPath
-    target.path = $$installPath
-    INSTALLS += target qmldir
-}
-
-CONFIG += no_cxx_module
-load(qml_plugin)
+TEMPLATE=subdirs
+SUBDIRS+=imports