From 4fbfbf7fe8e6f8f31b5704a0f8f55415a7284523 Mon Sep 17 00:00:00 2001
From: Cavit Sina Dogru <sinadooru@gmail.com>
Date: Wed, 3 Aug 2016 17:54:26 +0300
Subject: Qt object: Add exit(int)

This is similar to the Qt.quit() function but also specifies the return
code that the event loop will return.

[ChangeLog][QtQml] Added exit(int retCode) method to the Qt global object.
An application can call Qt.exit to specify a return code of the engine.

Task-number: QTBUG-54360
Change-Id: Iaa319e6dc4d6b99dc3a5c01845e87b936fd2cab0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 tools/qml/main.cpp      | 17 ++++++++++++++---
 tools/qmlscene/main.cpp |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index a795144984..d718067616 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -160,18 +160,23 @@ public:
     LoadWatcher(QQmlApplicationEngine *e, int expected)
         : QObject(e)
         , earlyExit(false)
+        , returnCode(0)
         , expect(expected)
         , haveOne(false)
     {
         connect(e, SIGNAL(objectCreated(QObject*,QUrl)),
             this, SLOT(checkFinished(QObject*)));
         // QQmlApplicationEngine also connects quit() to QCoreApplication::quit
-        // but if called before exec() then QCoreApplication::quit does nothing
+        // and exit() to QCoreApplication::exit but if called before exec()
+        // then QCoreApplication::quit or QCoreApplication::exit does nothing
         connect(e, SIGNAL(quit()),
             this, SLOT(quit()));
+        connect(e, &QQmlEngine::exit,
+            this, &LoadWatcher::exit);
     }
 
     bool earlyExit;
+    int returnCode;
 
 private:
     void contain(QObject *o, const QUrl &containPath);
@@ -196,14 +201,20 @@ public Q_SLOTS:
 
         if (! --expect) {
             printf("qml: Did not load any objects, exiting.\n");
-            exit(2);//Different return code from qFatal
+            std::exit(2);//Different return code from qFatal
         }
     }
 
     void quit() {
         //Will be checked before calling exec()
         earlyExit = true;
+        returnCode = 0;
     }
+    void exit(int retCode) {
+        earlyExit = true;
+        returnCode = retCode;
+    }
+
 #if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL)
     void onOpenGlContextCreated(QOpenGLContext *context);
 #endif
@@ -582,7 +593,7 @@ int main(int argc, char *argv[])
     }
 
     if (lw->earlyExit)
-        return 0;
+        return lw->returnCode;
 
     return app->exec();
 }
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 1185a8e7ae..0e542ab0c8 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -564,6 +564,7 @@ int main(int argc, char ** argv)
                 loadDummyDataFiles(engine, fi.path());
             }
             QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+            QObject::connect(&engine, &QQmlEngine::exit, QCoreApplication::instance(), &QCoreApplication::exit);
             component->loadUrl(options.url);
             while (component->isLoading())
                 QCoreApplication::processEvents();
-- 
cgit v1.2.3