Renaming "Qml Launcher" back to "QML Viewer"

Change the official name of the qml executable back to "Qt QML Viewer" -
the original name before it got renamed to "QML Runtime" and then
"QML Launcher".

Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease
command line use).

1 files changed, 7 insertions, 7 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 18e2531..22fc5ca 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -85,7 +85,7 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
-        QMessageBox::warning(0, QApplication::tr("Qt QML Launcher"), warnings);
+        QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings);
     }
 }
 
@@ -117,7 +117,7 @@ void usage()
     qWarning("  -frameless ............................... run with no window frame");
     qWarning("  -maximized................................ run maximized");
     qWarning("  -fullscreen............................... run fullscreen");
-    qWarning("  -stayontop................................ keep launcher window on top");
+    qWarning("  -stayontop................................ keep viewer window on top");
     qWarning("  -sizeviewtorootobject .................... the view resizes to the changes in the content");
     qWarning("  -sizerootobjecttoview .................... the content resizes to the changes in the view");
     qWarning("  -qmlbrowser .............................. use a QML-based file browser");
@@ -156,9 +156,9 @@ void scriptOptsUsage()
     qWarning("  testerror ................................ test 'error' property of root item on playback");
     qWarning("  snapshot ................................. file being recorded is static,");
     qWarning("                                             only one frame will be recorded or tested");
-    qWarning("  exitoncomplete ........................... cleanly exit the launcher on script completion");
-    qWarning("  exitonfailure ............................ immediately exit the launcher on script failure");
-    qWarning("  saveonexit ............................... save recording on launcher exit");
+    qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
+    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
+    qWarning("  saveonexit ............................... save recording on viewer exit");
     qWarning(" ");
     qWarning(" One of record, play or both must be specified.");
     exit(1);
@@ -196,7 +196,7 @@ int main(int argc, char ** argv)
 #endif
 
     QApplication app(argc, argv);
-    app.setApplicationName("QtQmlLauncher");
+    app.setApplicationName("QtQmlViewer");
     app.setOrganizationName("Nokia");
     app.setOrganizationDomain("nokia.com");
 
@@ -277,7 +277,7 @@ int main(int argc, char ** argv)
             if (lastArg) usage();
             app.setStartDragDistance(QString(argv[++i]).toInt());
         } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
-            qWarning("Qt QML Launcher version %s", QT_VERSION_STR);
+            qWarning("Qt QML Viewer version %s", QT_VERSION_STR);
             exit(0);
         } else if (arg == "-translation") {
             if (lastArg) usage();