From 2df52c4b8bd0aebfa42667be9f7ad8932b1dca45 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 12 Jan 2023 14:05:09 +0100 Subject: [PATCH] qmlproject: fix qmlViewerAspect - add its own settings key so it gets saved into the project settings - read the correct placeholder text, commandLineGetter is set too late and would also create a loop (qmlViewerAspect is used to get it) Change-Id: Iee3458cfe84e3f6b6750aa14d9d89347da21b37c Reviewed-by: Burak Hancerli Reviewed-by: Tim Jenssen --- src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h | 1 + src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h index 43b266d9995..e94f0efb494 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 3e5d648d520..b1a9a125df3 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(); 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(macroExpander()); argumentAspect->setSettingsKey(Constants::QML_VIEWER_ARGUMENTS_KEY);