Simplify example code by using QmlApplicationEngine

Since QmlApplicationEngine does all the nasty bits
including setting the incubation controller, we should
use it in all of our examples.

Task-number: QTBUG-31203
Change-Id: Ie4f2313b66ef1a460aa50559f5c0a6125d0c69f1
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

2 files changed, 4 insertions, 21 deletions

diff --git a/examples/quick/controls/shared/qt_quick_controls_examplemain.h b/examples/quick/controls/shared/qt_quick_controls_examplemain.h
index e3cae9a0..324d7110 100644
--- a/examples/quick/controls/shared/qt_quick_controls_examplemain.h
+++ b/examples/quick/controls/shared/qt_quick_controls_examplemain.h
@@ -64,20 +64,13 @@ QT_BEGIN_NAMESPACE
     int main(int argc, char *argv[]) \
     { \
         Application app(argc, argv); \
-        QQmlEngine engine; \
-        QQmlComponent component(&engine); \
-        component.loadUrl(QUrl(#url)); \
-        if ( !component.isReady() ) { \
-            qWarning("%s", qPrintable(component.errorString())); \
-            return -1; \
-        } \
-        QObject *topLevel = component.create(); \
+        QQmlApplicationEngine engine(QUrl(#url)); \
+        QObject *topLevel = engine.rootObjects().value(0); \
         QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel); \
         if ( !window ) { \
             qWarning("Error: Your root item has to be a Window."); \
             return -1; \
         } \
-        QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit())); \
         window->show(); \
         return app.exec(); \
     }
diff --git a/examples/quick/controls/text/src/main.cpp b/examples/quick/controls/text/src/main.cpp
index 0fc064dc..8d2b8dd0 100644
--- a/examples/quick/controls/text/src/main.cpp
+++ b/examples/quick/controls/text/src/main.cpp
@@ -49,24 +49,14 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    QQmlEngine engine;
-
     qmlRegisterType<DocumentHandler>("org.qtproject.example", 1, 0, "DocumentHandler");
-
-    QQmlComponent component(&engine);
-    component.loadUrl(QUrl("qrc:/qml/main.qml"));
-    if ( !component.isReady() ) {
-        qWarning("%s", qPrintable(component.errorString()));
-        return -1;
-    }
-    QObject *topLevel = component.create();
+    QQmlApplicationEngine engine(QUrl("qrc:/qml/main.qml"));
+    QObject *topLevel = engine.rootObjects().value(0);
     QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
     if ( !window ) {
         qWarning("Error: Your root item has to be a Window.");
         return -1;
     }
-
-    QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit()));
     window->show();
     return app.exec();
 }