diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-05-14 11:18:33 (GMT) |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-05-14 14:56:24 (GMT) |
commit | 77e1ef8cb41f790115ff7552717e0ba4d33c3cf0 (patch) | |
tree | 143ff5a276bd20eaa36d1b4a5b14cafcbaaad6b4 /tools/qml/qmlruntime.cpp | |
parent | 336feccaf4517605306844690103baf331f11d50 (diff) | |
download | Qt-77e1ef8cb41f790115ff7552717e0ba4d33c3cf0.zip Qt-77e1ef8cb41f790115ff7552717e0ba4d33c3cf0.tar.gz Qt-77e1ef8cb41f790115ff7552717e0ba4d33c3cf0.tar.bz2 |
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.
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
-rw-r--r-- | tools/qml/qmlruntime.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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()); |