diff options
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h | 1 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h index 43b266d999..e94f0efb49 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h @@ -9,6 +9,7 @@ namespace QmlProjectManager { namespace Constants { const char QML_PROJECT_ID[] = "QmlProjectManager.QmlProject"; +const char QML_VIEWER_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer"; const char QML_VIEWER_ARGUMENTS_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"; const char QML_VIEWER_TARGET_DISPLAY_NAME[] = "QML Viewer"; const char QML_MAINSCRIPT_KEY[] = "QmlProjectManager.QmlRunConfiguration.MainScript"; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 3e5d648d52..b1a9a125df 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -73,9 +73,10 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) { m_qmlViewerAspect = addAspect<StringAspect>(); m_qmlViewerAspect->setLabelText(tr("QML Viewer:")); - m_qmlViewerAspect->setPlaceHolderText(commandLine().executable().toString()); + m_qmlViewerAspect->setPlaceHolderText(qmlRuntimeFilePath().toUserOutput()); m_qmlViewerAspect->setDisplayStyle(StringAspect::LineEditDisplay); m_qmlViewerAspect->setHistoryCompleter("QmlProjectManager.viewer.history"); + m_qmlViewerAspect->setSettingsKey(Constants::QML_VIEWER_KEY); auto argumentAspect = addAspect<ArgumentsAspect>(macroExpander()); argumentAspect->setSettingsKey(Constants::QML_VIEWER_ARGUMENTS_KEY); |