diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-10 10:19:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 18:50:05 +0200 |
| commit | 035c646df1137eb8192f51701dc926a0f20e7ee8 (patch) | |
| tree | 3be8b2cbd015acc8d225251a5c60a3b1ed8ba210 /tools | |
| parent | 045a7219b0b8de8ea3843bc25c2622fa66408354 (diff) | |
QtQuick1: Fix qmlviewer no longer showing file dialog.
Change-Id: I81588fbe7141fb1df0d56b2dec2e8d495af975a0
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 10 |
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" |