feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rename QML Viewer to QML Runtime

Browse Source
This commit is contained in:
Kai Koehne
2010-03-10 16:37:25 +01:00
parent c0a8fbe9ff
commit 1a37b0e762
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -754,8 +754,8 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
else if (project->id() == QLatin1String("QmlProjectManager.QmlProject")) else if (project->id() == QLatin1String("QmlProjectManager.QmlProject"))
targets << TargetDescription(QString::fromLatin1("QmlProjectManager.QmlTarget"), targets << TargetDescription(QString::fromLatin1("QmlProjectManager.QmlTarget"),
QCoreApplication::translate("QmlProjectManager::QmlTarget", QCoreApplication::translate("QmlProjectManager::QmlTarget",
"QML Viewer", "QML Runtime",
"Qml Viewer target display name")); "Qml Runtime target display name"));
else else
return QVariantMap(); // We do not know how to handle this. return QVariantMap(); // We do not know how to handle this.

12
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View File

@@ -825,11 +825,11 @@ QProcess *DesignDocumentController::createPreviewProcess(const QString &dirPath)
temporaryFile->close(); temporaryFile->close();
previewProcess->start(QString("%1/qmlviewer").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList); previewProcess->start(QString("%1/qml").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
if (!previewProcess->waitForStarted()) if (!previewProcess->waitForStarted())
previewProcess->start("qmlviewer", qmlViewerArgumentList); previewProcess->start("qml", qmlViewerArgumentList);
if (!previewProcess->waitForStarted()) 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; 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."); QMessageBox::warning(documentWidget(), "qmldebugger not found", "qmldebugger should in the PATH or in the same directory like the bauhaus binary.");
previewProcess->setWorkingDirectory(dirPath); previewProcess->setWorkingDirectory(dirPath);
previewProcess->start(QString("%1/qmlviewer").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList); previewProcess->start(QString("%1/qml").arg(QCoreApplication::applicationDirPath()), qmlViewerArgumentList);
if (!previewProcess->waitForStarted()) if (!previewProcess->waitForStarted())
previewProcess->start("qmlviewer", qmlViewerArgumentList); previewProcess->start("qml", qmlViewerArgumentList);
if (!previewProcess->waitForStarted()) 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; return previewProcess;
} }

4
src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
View File

@@ -33,11 +33,11 @@ namespace QmlProjectManager {
namespace Constants { namespace Constants {
const char * const QML_RC_ID("QmlProjectManager.QmlRunConfiguration"); 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_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer");
const char * const QML_VIEWER_ARGUMENTS_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"); 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_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_MAINSCRIPT_KEY("QmlProjectManager.QmlRunConfiguration.MainScript");
const char * const QML_DEBUG_SERVER_ADDRESS_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerAddress"); const char * const QML_DEBUG_SERVER_ADDRESS_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerAddress");
const char * const QML_DEBUG_SERVER_PORT_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerPort"); const char * const QML_DEBUG_SERVER_PORT_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerPort");

6
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -90,7 +90,7 @@ void QmlProjectRunConfiguration::ctor()
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)), connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(changeCurrentFile(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) // prepend creator/bin dir to search path (only useful for special creator-qml package)
const QString searchPath = QCoreApplication::applicationDirPath() const QString searchPath = QCoreApplication::applicationDirPath()
@@ -203,8 +203,8 @@ QWidget *QmlProjectRunConfiguration::configurationWidget()
debugPort->setValue(m_debugServerPort); debugPort->setValue(m_debugServerPort);
connect(debugPort, SIGNAL(valueChanged(int)), this, SLOT(onDebugServerPortChanged())); connect(debugPort, SIGNAL(valueChanged(int)), this, SLOT(onDebugServerPortChanged()));
form->addRow(tr("QML Viewer"), qmlViewer); form->addRow(tr("QML Runtime"), qmlViewer);
form->addRow(tr("QML Viewer arguments:"), qmlViewerArgs); form->addRow(tr("QML Runtime arguments:"), qmlViewerArgs);
form->addRow(tr("Main QML File:"), combo); form->addRow(tr("Main QML File:"), combo);
form->addRow(tr("Debugging Address:"), debugServer); form->addRow(tr("Debugging Address:"), debugServer);
form->addRow(tr("Debugging Port:"), debugPort); form->addRow(tr("Debugging Port:"), debugPort);

6
src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
View File

@@ -44,7 +44,7 @@ QmlProjectTarget::QmlProjectTarget(QmlProject *parent) :
{ {
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget", setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME, Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
"Qml Viewer target display name")); "Qml Runtime target display name"));
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon)); setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
} }
@@ -69,7 +69,7 @@ bool QmlProjectTarget::fromMap(const QVariantMap &map)
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget", setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME, Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
"Qml Viewer target display name")); "Qml Runtime target display name"));
return true; return true;
} }
@@ -95,7 +95,7 @@ QString QmlProjectTargetFactory::displayNameForId(const QString &id) const
if (id == QLatin1String(Constants::QML_VIEWER_TARGET_ID)) if (id == QLatin1String(Constants::QML_VIEWER_TARGET_ID))
return QCoreApplication::translate("QmlProjectManager::QmlTarget", return QCoreApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME, Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
"Qml Viewer target display name"); "Qml Runtime target display name");
return QString(); return QString();
} }