1 files changed, 25 insertions, 12 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 06ed37a00e..90d2a940a3 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -53,6 +53,7 @@
 #include <QFileInfo>
 #include <QRegularExpression>
 #include <QStringList>
+#include <QScopedPointer>
 #include <QDebug>
 #include <QStandardPaths>
 #include <QTranslator>
@@ -67,8 +68,8 @@
 #include <cstdlib>
 
 #define VERSION_MAJ 1
-#define VERSION_MIN 0
-#define VERSION_STR "1.0"
+#define VERSION_MIN 1
+#define VERSION_STR "1.1"
 
 #define FILE_OPEN_EVENT_WAIT_TIME 3000 // ms
 
@@ -163,13 +164,20 @@ class LoadWatcher : public QObject
 public:
     LoadWatcher(QQmlApplicationEngine *e, int expected)
         : QObject(e)
+        , earlyExit(false)
         , 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
+        connect(e, SIGNAL(quit()),
+            this, SLOT(quit()));
     }
 
+    bool earlyExit;
+
 private:
     void contain(QObject *o, const QUrl &containPath);
     void checkForWindow(QObject *o);
@@ -196,6 +204,11 @@ public Q_SLOTS:
             exit(2);//Different return code from qFatal
         }
     }
+
+    void quit() {
+        //Will be checked before calling exec()
+        earlyExit = true;
+    }
 #if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL)
     void onOpenGlContextCreated(QOpenGLContext *context);
 #endif
@@ -293,11 +306,10 @@ void printVersion()
 
 void printUsage()
 {
-    printf("Usage: qml [options] [files]\n");
+    printf("Usage: qml [options] [files] [-- args]\n");
     printf("\n");
-    printf("Any argument ending in .qml will be treated as a QML file to be loaded.\n");
+    printf("Any unknown argument before '--' will be treated as a QML file to be loaded.\n");
     printf("Any number of QML files can be loaded. They will share the same engine.\n");
-    printf("Any argument which is not a recognized option and which does not end in .qml will be ignored.\n");
     printf("'gui' application type is only available if the QtGui module is available.\n");
     printf("'widget' application type is only available if the QtWidgets module is available.\n");
     printf("\n");
@@ -434,8 +446,8 @@ int main(int argc, char *argv[])
     app->setOrganizationName("QtProject");
     app->setOrganizationDomain("qt-project.org");
 
-    qmlRegisterType<Config>("QmlRuntime.Config", VERSION_MAJ, VERSION_MIN, "Configuration");
-    qmlRegisterType<PartialScene>("QmlRuntime.Config", VERSION_MAJ, VERSION_MIN, "PartialScene");
+    qmlRegisterType<Config>("QmlRuntime.Config", 1, 0, "Configuration");
+    qmlRegisterType<PartialScene>("QmlRuntime.Config", 1, 0, "PartialScene");
     QQmlApplicationEngine e;
     QStringList files;
     QString confFile;
@@ -444,7 +456,7 @@ int main(int argc, char *argv[])
 
     //Handle main arguments
     QStringList argList = app->arguments();
-    for (int i = 0; i < argList.count(); i++) {
+    for (int i = 1; i < argList.count(); i++) {
         const QString &arg = argList[i];
         if (arg == QLatin1String("-quiet"))
             quietMode = true;
@@ -492,9 +504,7 @@ int main(int argc, char *argv[])
         } else if (arg == QLatin1String("-desktop")) {
             QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
         } else {
-            //If it ends in .qml, treat it as a file. Else ignore it
-            if (arg.endsWith(".qml"))
-                files << arg;
+            files << arg;
         }
     }
 
@@ -538,7 +548,7 @@ int main(int argc, char *argv[])
     loadConf(confFile, !verboseMode);
 
     //Load files
-    LoadWatcher lw(&e, files.count());
+    QScopedPointer<LoadWatcher> lw(new LoadWatcher(&e, files.count()));
 
     // Load dummy data before loading QML-files
     if (!dummyDir.isEmpty() && QFileInfo (dummyDir).isDir())
@@ -570,6 +580,9 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (lw->earlyExit)
+        return 0;
+
     return app->exec();
 }