diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-01-12 16:42:15 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-01-12 16:42:15 +0100 |
| commit | 4aea4ea693b2964d60a10c81df13f91274008875 (patch) | |
| tree | 1b213ba1a3e0cae369f6fa7d6b58ab64f79f380f /src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | |
| parent | 6af8487203d889cf399054213329f8d18e522ef5 (diff) | |
| parent | 1b6d434c9c045d09d3760f7db2025e29d37dc25c (diff) | |
| download | qt-creator-4aea4ea693b2964d60a10c81df13f91274008875.tar.gz | |
Merge remote-tracking branch 'origin/9.0' into qds/dev
Conflicts:
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: Idc7be1f8871df51f7372ea66f81178cfe3e68846
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 791a3c6a56..ba2ba9717f 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::PathChooserDisplay); 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); |