summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/qml/main.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index ae2fee11..7e593f67 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -604,14 +604,12 @@ int main(int argc, char ** argv)
}
}
- if (filesRunning != 0) {
- QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
-
- return app.exec();
- } else {
+ // File names passed, but they are all of version 2. 'qmlscene' was launched by checkVersion, quit.
+ if (!fileNames.isEmpty() && !filesRunning)
return 0;
- }
+ QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
+ return app.exec();
}
#include "main.moc"