Merge pull request #54 from neochapay/master

Move qml files to separate dir

Merge pull request #54 from neochapay/master
Move qml files to separate dir
a586e787 · Aleksi Suomalainen · GitHub · 09c62c40 · cbeb5326 · a586e787
Commit a586e787 authored Nov 07, 2017 by Aleksi Suomalainen Committed by GitHub Nov 07, 2017
42 changed files
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -7,24 +7,24 @@ THEME_IMPORT_PATH = QtQuick/Controls/Styles/Nemo/themes
 # Added/Reimplemented Controls
 QML_FILES += \
-    Button.qml \
+    qml/Button.qml \
-    ApplicationWindow.qml \
+    qml/ApplicationWindow.qml \
-    Page.qml \
+    qml/Page.qml \
-    Spinner.qml \
+    qml/Spinner.qml \
-    Label.qml \
+    qml/Label.qml \
-    Checkbox.qml\
+    qml/Checkbox.qml\
-    ButtonRow.qml \
+    qml/ButtonRow.qml \
-    QueryDialog.qml \
+    qml/QueryDialog.qml \
-    Header.qml \
+    qml/Header.qml \
-    HeaderToolsLayout.qml \
+    qml/HeaderToolsLayout.qml \
-    Slider.qml\
+    qml/Slider.qml\
-    ListView.qml \
+    qml/ListView.qml \
-    ListViewItemWithActions.qml\
+    qml/ListViewItemWithActions.qml\
-    GlacierRoller.qml \
+    qml/GlacierRoller.qml \
-    GlacierRollerItem.qml \
+    qml/GlacierRollerItem.qml \
-    InverseMouseArea.qml \
+    qml/InverseMouseArea.qml \
-    IconButton.qml \
+    qml/IconButton.qml \
-    DatePicker.qml
+    qml/DatePicker.qml
 OTHER_FILES += qmldir \
    $$QML_FILES
@@ -55,8 +55,8 @@ SOURCES += \
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
-qmlfiles.files = $$_PRO_FILE_PWD_/*.qml
+qmlfiles.files = $$_PRO_FILE_PWD_/qml/*.qml
-qmlfiles.files += $$_PRO_FILE_PWD_/qmldir
+qmlfiles.files += $$_PRO_FILE_PWD_/qml/qmldir
 qmlfiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 images.files = $$_PRO_FILE_PWD_/images

--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
--- a/src/controls/ButtonRow.qml
+++ b/src/controls/ButtonRow.qml
--- a/src/controls/Checkbox.qml
+++ b/src/controls/Checkbox.qml
--- a/src/controls/DatePicker.qml
+++ b/src/controls/DatePicker.qml
--- a/src/controls/GlacierRoller.qml
+++ b/src/controls/GlacierRoller.qml
--- a/src/controls/GlacierRollerItem.qml
+++ b/src/controls/GlacierRollerItem.qml
--- a/src/controls/Header.qml
+++ b/src/controls/Header.qml
--- a/src/controls/HeaderToolsLayout.qml
+++ b/src/controls/HeaderToolsLayout.qml
--- a/src/controls/IconButton.qml
+++ b/src/controls/IconButton.qml
--- a/src/controls/InverseMouseArea.qml
+++ b/src/controls/InverseMouseArea.qml
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
--- a/src/controls/ListView.qml
+++ b/src/controls/ListView.qml
--- a/src/controls/ListViewItemWithActions.qml
+++ b/src/controls/ListViewItemWithActions.qml
--- a/src/controls/Page.qml
+++ b/src/controls/Page.qml
--- a/src/controls/QueryDialog.qml
+++ b/src/controls/QueryDialog.qml
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
--- a/src/controls/Spinner.qml
+++ b/src/controls/Spinner.qml
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
--- a/src/styles/CheckBoxStyle.qml
+++ b/src/styles/CheckBoxStyle.qml
--- a/src/styles/ComboBoxStyle.qml
+++ b/src/styles/ComboBoxStyle.qml
--- a/src/styles/FocusFrameStyle.qml
+++ b/src/styles/FocusFrameStyle.qml
--- a/src/styles/GrooveStyle.qml
+++ b/src/styles/GrooveStyle.qml
--- a/src/styles/GroupBoxStyle.qml
+++ b/src/styles/GroupBoxStyle.qml
--- a/src/styles/IconButtonStyle.qml
+++ b/src/styles/IconButtonStyle.qml
--- a/src/styles/MenuBarStyle.qml
+++ b/src/styles/MenuBarStyle.qml
--- a/src/styles/MenuStyle.qml
+++ b/src/styles/MenuStyle.qml
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
--- a/src/styles/RadioButtonStyle.qml
+++ b/src/styles/RadioButtonStyle.qml
--- a/src/styles/ScrollViewStyle.qml
+++ b/src/styles/ScrollViewStyle.qml
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
--- a/src/styles/SpinBoxStyle.qml
+++ b/src/styles/SpinBoxStyle.qml
--- a/src/styles/StatusBarStyle.qml
+++ b/src/styles/StatusBarStyle.qml
--- a/src/styles/TabViewStyle.qml
+++ b/src/styles/TabViewStyle.qml
--- a/src/styles/TableViewStyle.qml
+++ b/src/styles/TableViewStyle.qml
--- a/src/styles/TextFieldStyle.qml
+++ b/src/styles/TextFieldStyle.qml
--- a/src/styles/ToolBarStyle.qml
+++ b/src/styles/ToolBarStyle.qml
--- a/src/styles/ToolButtonStyle.qml
+++ b/src/styles/ToolButtonStyle.qml
--- a/src/styles/qmldir
+++ b/src/styles/qmldir
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -8,26 +8,26 @@ QT+=qml
 # Styles
 QML_FILES = \
-    ButtonStyle.qml \
+    qml/ButtonStyle.qml \
-    CheckBoxStyle.qml \
+    qml/CheckBoxStyle.qml \
-    ComboBoxStyle.qml \
+    qml/ComboBoxStyle.qml \
-    FocusFrameStyle.qml \
+    qml/FocusFrameStyle.qml \
-    GrooveStyle.qml \
+    qml/GrooveStyle.qml \
-    GroupBoxStyle.qml \
+    qml/GroupBoxStyle.qml \
-    MenuBarStyle.qml \
+    qml/MenuBarStyle.qml \
-    MenuStyle.qml \
+    qml/MenuStyle.qml \
-    ProgressBarStyle.qml \
+    qml/ProgressBarStyle.qml \
-    RadioButtonStyle.qml \
+    qml/RadioButtonStyle.qml \
-    ScrollViewStyle.qml\
+    qml/ScrollViewStyle.qml\
-    SliderStyle.qml \
+    qml/SliderStyle.qml \
-    SpinBoxStyle.qml \
+    qml/SpinBoxStyle.qml \
-    StatusBarStyle.qml \
+    qml/StatusBarStyle.qml \
-    TableViewStyle.qml \
+    qml/TableViewStyle.qml \
-    TabViewStyle.qml \
+    qml/TabViewStyle.qml \
-    TextFieldStyle.qml \
+    qml/TextFieldStyle.qml \
-    ToolBarStyle.qml \
+    qml/ToolBarStyle.qml \
-    ToolButtonStyle.qml \
+    qml/ToolButtonStyle.qml \
-    IconButtonStyle.qml
+    qml/IconButtonStyle.qml
 # Images
 QML_FILES += \
@@ -64,8 +64,8 @@ OTHER_FILES += qmldir \
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
-qmlfiles.files = $$_PRO_FILE_PWD_/*.qml
+qmlfiles.files = $$_PRO_FILE_PWD_/qml/*.qml
-qmlfiles.files += $$_PRO_FILE_PWD_/qmldir
+qmlfiles.files += $$_PRO_FILE_PWD_/qml/qmldir
 qmlfiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 themes.files = $$_PRO_FILE_PWD_/themes/*.json