Merge pull request #5 from neochapay/examples

Examples

.gitignore

@@ -9,7 +9,7 @@ qrc_*
 .qmake.stash
 *.spec.*
 documentation.list
-examples/touch/touch_nemo
+examples/touch/glacier-components
 Makefile
 installroot/
 RPMS/
\ No newline at end of file

examples/touch/glacier-gallery.desktop

 [Desktop Entry]
 Type=Application
-Name=Glacier UI
+Name=Glacier components
 Categories=Applications;
-Exec=env QT_QUICK_CONTROLS_STYLE=Nemo /usr/lib/qt5/examples/touch_nemo
+Exec=env QT_QUICK_CONTROLS_STYLE=Nemo /usr/bin/glacier-components
 Icon=icon-app-components
 
 X-Desktop-File-Install-Version=0.20

examples/touch/resources.qrc

-<RCC>
-    <qresource prefix="/">
-        <file>main.qml</file>
-        <file>content/AndroidDelegate.qml</file>
-        <file>content/ButtonPage.qml</file>
-        <file>content/ProgressBarPage.qml</file>
-        <file>content/SliderPage.qml</file>
-        <file>content/TabBarPage.qml</file>
-        <file>content/TextInputPage.qml</file>
-        <file>content/SelectRollerPage.qml</file>
-        <file>images/button_default.png</file>
-        <file>images/button_pressed.png</file>
-        <file>images/navigation_next_item.png</file>
-        <file>images/navigation_previous_item.png</file>
-        <file>images/tab_selected.png</file>
-        <file>images/tabs_standard.png</file>
-        <file>images/textinput.png</file>
-        <file>images/toolbar.png</file>
-        <file>content/LiveCoding.qml</file>
-        <file>content/SpinnerPage.qml</file>
-        <file>content/LabelPage.qml</file>
-        <file>content/CheckboxPage.qml</file>
-        <file>content/ButtonRowPage.qml</file>
-        <file>content/QueryDialogPage.qml</file>
-        <file>images/dots-vertical.png</file>
-        <file>images/icon-triangle-left.png</file>
-        <file>images/icon_cog.png</file>
-        <file>images/icon_edit.png</file>
-        <file>images/icon_refresh.png</file>
-    </qresource>
-</RCC>

examples/touch/src/main.cpp

 /****************************************************************************
 **
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2017 Chupligin Sergey neochapay@gmail.com
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Quick Controls module of the Qt Toolkit.
@@ -37,6 +38,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QApplication>
+#include <QQmlApplicationEngine>
 
-#include "../../shared/qt_quick_controls_examplemain.h"
-QT_QUICK_CONTROLS_EXAMPLE_MAIN(qrc:/main.qml)
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("/usr/share/glacier-components/main.qml")));
+    return app.exec();
+}

examples/touch/src/src.pri

-SOURCES += \
-    $$PWD/main.cpp

examples/touch/touch.pro

 TEMPLATE = app
 QT += qml quick
-TARGET = touch_nemo
-target.path = /usr/lib/qt5/examples
+TARGET = glacier-components
+target.path = /usr/bin
 
 qtHaveModule(widgets) {
     QT += widgets
 }
 
-include(src/src.pri)
+mainqml.files = main.qml
+mainqml.path = /usr/share/glacier-components
+
+qml.files += \
+    content/AndroidDelegate.qml \
+    content/ButtonPage.qml \
+    content/ProgressBarPage.qml \
+    content/SliderPage.qml \
+    content/TabBarPage.qml \
+    content/TextInputPage.qml \
+    content/LiveCoding.qml \
+    content/SpinnerPage.qml \
+    content/LabelPage.qml \
+    content/CheckboxPage.qml \
+    content/ButtonRowPage.qml \
+    content/QueryDialogPage.qml \
+    content/ListViewPage.qml \
+    content/SelectRollerPage.qml
+
+qml.path = /usr/share/glacier-components/content
+
+images.files = images/*.png
+images.path = /usr/share/glacier-components/images
 
 OTHER_FILES += \
     main.qml \
@@ -23,18 +45,14 @@ OTHER_FILES += \
     content/CheckboxPage.qml \
     content/ButtonRowPage.qml \
     content/QueryDialogPage.qml \
+    content/ListViewPage.qml \
     content/SelectRollerPage.qml
 
-RESOURCES += \
-    resources.qrc
-
-INSTALLS += target
 
 desktop.path = /usr/share/applications
 desktop.files = glacier-gallery.desktop
-INSTALLS += desktop
 
-DISTFILES += \
-    content/ListViewPage.qml \
-    content/SelectRollerPage.qml
+INSTALLS += desktop target qml mainqml images
 
+SOURCES += \
+    src/main.cpp

rpm/qtquickcontrols-nemo.spec

@@ -68,6 +68,7 @@ desktop-file-install --delete-original       \
 
 %files examples
 %defattr(-,root,root,-)
-%{_libdir}/qt5/examples/touch_nemo
+%{_bindir}/glacier-components
+%{_datadir}/glacier-components
 %{_datadir}/applications/*.desktop