Commit adad842b authored by Kai Koehne's avatar Kai Koehne
Browse files

Rename QML Runtime to QML Viewer again in the UI

Latest qt renamed qml executable back to qmlviewer, and also named
the executable again QML Viewer instead of Runtime/Launcher.
parent 392123e7
...@@ -796,8 +796,8 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map) ...@@ -796,8 +796,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 Runtime", "QML Viewer",
"QML Runtime target display name")); "QML Viewer 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.
......
...@@ -33,11 +33,11 @@ namespace QmlProjectManager { ...@@ -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 Runtime")); const char * const QML_RC_DISPLAY_NAME(QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer"));
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 Runtime"); const char * const QML_VIEWER_TARGET_DISPLAY_NAME("QML Viewer");
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");
......
...@@ -99,13 +99,20 @@ void QmlProjectRunConfiguration::ctor() ...@@ -99,13 +99,20 @@ 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 Runtime", "QMLRunConfiguration display name.")); setDisplayName(tr("QML Viewer", "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()
+ Utils::SynchronousProcess::pathSeparator() + Utils::SynchronousProcess::pathSeparator()
+ QString(qgetenv("PATH")); + QString(qgetenv("PATH"));
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qml"));
#ifdef Q_OS_MAC
const QString qmlViewerName = QLatin1String("QMLViewer");
#else
const QString qmlViewerName = QLatin1String("qmlviewer");
#endif
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, qmlViewerName);
} }
QmlProjectRunConfiguration::~QmlProjectRunConfiguration() QmlProjectRunConfiguration::~QmlProjectRunConfiguration()
...@@ -196,8 +203,8 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget() ...@@ -196,8 +203,8 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
debugPort->setValue(m_debugData.serverPort); debugPort->setValue(m_debugData.serverPort);
connect(debugPort, SIGNAL(valueChanged(int)), this, SLOT(onDebugServerPortChanged())); connect(debugPort, SIGNAL(valueChanged(int)), this, SLOT(onDebugServerPortChanged()));
form->addRow(tr("QML Runtime"), qmlViewer); form->addRow(tr("QML Viewer"), qmlViewer);
form->addRow(tr("QML Runtime arguments:"), qmlViewerArgs); form->addRow(tr("QML Viewer arguments:"), qmlViewerArgs);
form->addRow(tr("Main QML File:"), m_fileListCombo.data()); form->addRow(tr("Main QML File:"), m_fileListCombo.data());
form->addRow(tr("Debugging Address:"), debugServer); form->addRow(tr("Debugging Address:"), debugServer);
form->addRow(tr("Debugging Port:"), debugPort); form->addRow(tr("Debugging Port:"), debugPort);
......
...@@ -45,7 +45,7 @@ QmlProjectTarget::QmlProjectTarget(QmlProject *parent) : ...@@ -45,7 +45,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 Runtime target display name")); "QML Viewer target display name"));
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon)); setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
} }
...@@ -75,7 +75,7 @@ bool QmlProjectTarget::fromMap(const QVariantMap &map) ...@@ -75,7 +75,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 Runtime target display name")); "QML Viewer target display name"));
return true; return true;
} }
...@@ -101,7 +101,7 @@ QString QmlProjectTargetFactory::displayNameForId(const QString &id) const ...@@ -101,7 +101,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 Runtime target display name"); "QML Viewer target display name");
return QString(); return QString();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment