From 1a37b0e762a2746453ae1c52779fbdeed50ded72 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 10 Mar 2010 16:37:25 +0100
Subject: [PATCH] Rename QML Viewer to QML Runtime
---
src/plugins/projectexplorer/userfileaccessor.cpp | 4 ++--
.../integration/designdocumentcontroller.cpp | 12 ++++++------
.../qmlprojectmanager/qmlprojectmanagerconstants.h | 4 ++--
.../qmlprojectmanager/qmlprojectrunconfiguration.cpp | 6 +++---
src/plugins/qmlprojectmanager/qmlprojecttarget.cpp | 6 +++---
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index bb36f662ff9..65df8071647 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -754,8 +754,8 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
else if (project->id() == QLatin1String("QmlProjectManager.QmlProject"))
targets << TargetDescription(QString::fromLatin1("QmlProjectManager.QmlTarget"),
QCoreApplication::translate("QmlProjectManager::QmlTarget",
- "QML Viewer",
- "Qml Viewer target display name"));
+ "QML Runtime",
+ "Qml Runtime target display name"));
else
return QVariantMap(); // We do not know how to handle this.
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 129eab13b81..71e0ed10ec9 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -825,11 +825,11 @@ QProcess *DesignDocumentController::createPreviewProcess(const QString &dirPath)
temporaryFile->close();
- previewProcess->start(QString("%1/qmlviewer").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
+ previewProcess->start(QString("%1/qml").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
if (!previewProcess->waitForStarted())
- previewProcess->start("qmlviewer", qmlViewerArgumentList);
+ previewProcess->start("qml", qmlViewerArgumentList);
if (!previewProcess->waitForStarted())
- QMessageBox::warning(documentWidget(), "qmlviewer not found", "qmlviewer should be in the PATH or in the same directory like the bauhaus binary.");
+ QMessageBox::warning(documentWidget(), "qml runtime not found", "qml runtime should be in the PATH or in the same directory like the bauhaus binary.");
return previewProcess;
}
@@ -869,11 +869,11 @@ QProcess *DesignDocumentController::createPreviewWithDebugProcess(const QString
QMessageBox::warning(documentWidget(), "qmldebugger not found", "qmldebugger should in the PATH or in the same directory like the bauhaus binary.");
previewProcess->setWorkingDirectory(dirPath);
- previewProcess->start(QString("%1/qmlviewer").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
+ previewProcess->start(QString("%1/qml").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
if (!previewProcess->waitForStarted())
- previewProcess->start("qmlviewer", qmlViewerArgumentList);
+ previewProcess->start("qml", qmlViewerArgumentList);
if (!previewProcess->waitForStarted())
- QMessageBox::warning(documentWidget(), "qmlviewer not found", "qmlviewer should in the PATH or in the same directory like the bauhaus binary.");
+ QMessageBox::warning(documentWidget(), "qml runtime not found", "qml runtime should in the PATH or in the same directory like the bauhaus binary.");
return previewProcess;
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
index bcd4c4856c9..1799b6d5626 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
@@ -33,11 +33,11 @@ namespace QmlProjectManager {
namespace Constants {
const char * const QML_RC_ID("QmlProjectManager.QmlRunConfiguration");
-const char * const QML_RC_DISPLAY_NAME(QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer"));
+const char * const QML_RC_DISPLAY_NAME(QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Runtime"));
const char * const QML_VIEWER_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer");
const char * const QML_VIEWER_ARGUMENTS_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments");
const char * const QML_VIEWER_TARGET_ID("QmlProjectManager.QmlTarget");
-const char * const QML_VIEWER_TARGET_DISPLAY_NAME("QML Viewer");
+const char * const QML_VIEWER_TARGET_DISPLAY_NAME("QML Runtime");
const char * const QML_MAINSCRIPT_KEY("QmlProjectManager.QmlRunConfiguration.MainScript");
const char * const QML_DEBUG_SERVER_ADDRESS_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerAddress");
const char * const QML_DEBUG_SERVER_PORT_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerPort");
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index be1106c7c85..110c58d8eed 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -90,7 +90,7 @@ void QmlProjectRunConfiguration::ctor()
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(changeCurrentFile(Core::IEditor*)));
- setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
+ setDisplayName(tr("QML Runtime", "QMLRunConfiguration display name."));
// prepend creator/bin dir to search path (only useful for special creator-qml package)
const QString searchPath = QCoreApplication::applicationDirPath()
@@ -203,8 +203,8 @@ QWidget *QmlProjectRunConfiguration::configurationWidget()
debugPort->setValue(m_debugServerPort);
connect(debugPort, SIGNAL(valueChanged(int)), this, SLOT(onDebugServerPortChanged()));
- form->addRow(tr("QML Viewer"), qmlViewer);
- form->addRow(tr("QML Viewer arguments:"), qmlViewerArgs);
+ form->addRow(tr("QML Runtime"), qmlViewer);
+ form->addRow(tr("QML Runtime arguments:"), qmlViewerArgs);
form->addRow(tr("Main QML File:"), combo);
form->addRow(tr("Debugging Address:"), debugServer);
form->addRow(tr("Debugging Port:"), debugPort);
diff --git a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
index 3c0fd2f31fe..c109fab6012 100644
--- a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
@@ -44,7 +44,7 @@ QmlProjectTarget::QmlProjectTarget(QmlProject *parent) :
{
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Viewer target display name"));
+ "Qml Runtime target display name"));
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
}
@@ -69,7 +69,7 @@ bool QmlProjectTarget::fromMap(const QVariantMap &map)
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Viewer target display name"));
+ "Qml Runtime target display name"));
return true;
}
@@ -95,7 +95,7 @@ QString QmlProjectTargetFactory::displayNameForId(const QString &id) const
if (id == QLatin1String(Constants::QML_VIEWER_TARGET_ID))
return QCoreApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Viewer target display name");
+ "Qml Runtime target display name");
return QString();
}
--
GitLab