Move to libglacierapp

examples/touch/src/main.cpp

@@ -42,18 +42,16 @@
 #include <QQmlApplicationEngine>
 #include <QtQuick/QQuickView>
 
+#include <glacierapp.h>
+
 int main(int argc, char *argv[])
 {
     setenv("QT_QUICK_CONTROLS_STYLE", "Nemo", 1);
-    QGuiApplication app(argc, argv);
-
-    QQmlApplicationEngine* engine = new QQmlApplicationEngine(QUrl("/usr/share/glacier-components/main.qml"));
-
-    QObject *topLevel = engine->rootObjects().value(0);
+    QGuiApplication *app = GlacierApp::app(argc, argv);
+    app->setOrganizationName("NemoMobile");
 
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
+    QQuickWindow *window = GlacierApp::showWindow();
     window->setTitle(QObject::tr("Glacier components"));
-    window->showFullScreen();
 
-    return app.exec();
+    return app->exec();
 }

examples/touch/touch.pro

@@ -3,12 +3,12 @@ QT += qml quick
 TARGET = glacier-components
 target.path = /usr/bin
 
-qtHaveModule(widgets) {
-    QT += widgets
-}
+CONFIG += link_pkgconfig
+LIBS += -lglacierapp
+PKGCONFIG += glacierapp
 
-mainqml.files = main.qml
-mainqml.path = /usr/share/glacier-components
+mainqml.files = glacier-components.qml
+mainqml.path = /usr/share/glacier-components/qml
 
 qml.files += \
     content/AndroidDelegate.qml \
@@ -28,7 +28,7 @@ qml.files += \
     content/IconPage.qml \
     content/DatePickerPage.qml
 
-qml.path = /usr/share/glacier-components/content
+qml.path = /usr/share/glacier-components/qml/content
 
 images.files = images/*.png
 images.files += images/*.jpg
@@ -36,7 +36,6 @@ images.path = /usr/share/glacier-components/images
 
 OTHER_FILES += $$qml.files
 
-
 desktop.path = /usr/share/applications
 desktop.files = glacier-gallery.desktop
 

rpm/qtquickcontrols-nemo.spec

 Name:       qt5-qtquickcontrols-nemo
 Summary:    Nemomobile Qt Quick Controls
-Version:    5.3.1
+Version:    5.3.2
 Release:    nemo1
 Group:      System/Library
 License:    LGPLv2.1 with exception or GPLv3
@@ -10,9 +10,12 @@ BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  fdupes
+BuildRequires:  pkgconfig(glacierapp)
+
 Requires:   qt5-qtquickcontrols
 Requires:   qt5-qtgraphicaleffects
 Requires:   nemo-theme-glacier
+Requires:   libglacierapp
 
 %description
 Qt is a cross-platform application and UI framework. Using Qt, you can