Rename QML Runtime (executable) to QML Launcher

The qml executable was first referred to as  QML Viewer, then QML Runtime ...
however, the latter one caused much confusion (see old version of
qmlruntime.qdoc).

Doc changes reviewed by Leena Miettinen.

5 files changed, 18 insertions, 17 deletions

diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf
index 22db23e..e7a1dbc 100644
--- a/tools/qdoc3/test/macros.qdocconf
+++ b/tools/qdoc3/test/macros.qdocconf
@@ -18,6 +18,7 @@ macro.ouml.HTML         = "ö"
 macro.QA                = "\\e{Qt Assistant}"
 macro.QD                = "\\e{Qt Designer}"
 macro.QL                = "\\e{Qt Linguist}"
+macro.QQL               = "\\e{Qt QML Launcher}"
 macro.param             = "\\e"
 macro.raisedaster.HTML  = "<sup>*</sup>"
 macro.rarrow.HTML       = "&rarr;"
diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 0912f58..c3a2cc0 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -12,12 +12,12 @@ Rectangle {
     FolderListModel {
         id: folders1
         nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
+        folder: qmlLauncherFolder
     }
     FolderListModel {
         id: folders2
         nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
+        folder: qmlLauncherFolder
     }
 
     SystemPalette { id: palette }
@@ -62,7 +62,7 @@ Rectangle {
                 if (folders.isFolder(index)) {
                     down(filePath);
                 } else {
-                    qmlViewer.launch(filePath);
+                    qmlLauncher.launch(filePath);
                 }
             }
             width: root.width
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index d1fc118..380f5cc 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -86,7 +86,7 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
-        QMessageBox::warning(0, QApplication::tr("Qt Declarative UI Runtime"), warnings);
+        QMessageBox::warning(0, QApplication::tr("Qt QML Launcher"), warnings);
     }
 }
 
@@ -118,7 +118,7 @@ void usage()
     qWarning("  -frameless ............................... run with no window frame");
     qWarning("  -maximized................................ run maximized");
     qWarning("  -fullscreen............................... run fullscreen");
-    qWarning("  -stayontop................................ keep viewer window on top");
+    qWarning("  -stayontop................................ keep launcher 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");
@@ -157,9 +157,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 viewer on script completion");
-    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
-    qWarning("  saveonexit ............................... save recording on viewer exit");
+    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(" ");
     qWarning(" One of record, play or both must be specified.");
     exit(1);
@@ -197,7 +197,7 @@ int main(int argc, char ** argv)
 #endif
 
     QApplication app(argc, argv);
-    app.setApplicationName("QtQmlRuntime");
+    app.setApplicationName("QtQmlLauncher");
     app.setOrganizationName("Nokia");
     app.setOrganizationDomain("nokia.com");
 
@@ -275,7 +275,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 Runtime version %s", QT_VERSION_STR);
+            qWarning("Qt QML Launcher version %s", QT_VERSION_STR);
             exit(0);
         } else if (arg == "-translation") {
             if (lastArg) usage();
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 77a9533..847ed3a 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -37,5 +37,5 @@ symbian {
 }
 mac {
     QMAKE_INFO_PLIST=Info_mac.plist
-    TARGET=Qml
+    TARGET="QML Launcher"
 }
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 911bf8c..9700090 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -350,7 +350,7 @@ QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
     setupProxy(manager);
     if (cacheSize > 0) {
         QNetworkDiskCache *cache = new QNetworkDiskCache;
-        cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-duiviewer-network-cache"));
+        cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-launcher-network-cache"));
         cache->setMaximumCacheSize(cacheSize);
         manager->setCache(cache);
     } else {
@@ -388,7 +388,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , translator(0)
 {
     QDeclarativeViewer::registerTypes();
-    setWindowTitle(tr("Qt Qml Runtime"));
+    setWindowTitle(tr("Qt QML Launcher"));
 
     devicemode = false;
     canvas = 0;
@@ -887,7 +887,7 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
         url = QUrl::fromLocalFile(fi.absoluteFilePath());
     else
         url = QUrl(file_or_url);
-    setWindowTitle(tr("%1 - Qt Qml Runtime").arg(file_or_url));
+    setWindowTitle(tr("%1 - Qt QML Launcher").arg(file_or_url));
 
     if (!m_script.isEmpty())
         tester = new QDeclarativeTester(m_script, m_scriptOptions, canvas);
@@ -895,11 +895,11 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
     delete canvas->rootObject();
     canvas->engine()->clearComponentCache();
     QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("qmlViewer", this);
+    ctxt->setContextProperty("qmlLauncher", this);
 #ifdef Q_OS_SYMBIAN
-    ctxt->setContextProperty("qmlViewerFolder", "E:\\"); // Documents on your S60 phone
+    ctxt->setContextProperty("qmlLauncherFolder", "E:\\"); // Documents on your S60 phone
 #else
-    ctxt->setContextProperty("qmlViewerFolder", QDir::currentPath());
+    ctxt->setContextProperty("qmlLauncherFolder", QDir::currentPath());
 #endif
 
     ctxt->setContextProperty("runtime", Runtime::instance());