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

Merge remote-tracking branch 'origin/9.0' into qds/dev

Browse Source 
Conflicts:
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idc7be1f8871df51f7372ea66f81178cfe3e68846
This commit is contained in:
Tim Jenssen
2023-01-12 16:42:15 +01:00
parent 6af8487203 1b6d434c9c
commit 4aea4ea693
11 changed files with 228 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);