diff options
author | hjk <hjk@qt.io> | 2022-11-28 14:16:21 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-11-30 14:47:56 +0000 |
commit | 82ecd3910b10d5722f7c2792e70eb4f96d881955 (patch) | |
tree | ea8021bd1da629b96293f9ef46e106780fc4e792 | |
parent | c7f9d9af24af1b226e49b8798741c815bc33e6db (diff) | |
download | qt-creator-82ecd3910b10d5722f7c2792e70eb4f96d881955.tar.gz |
QmlProjectManager: Use a PathChooser for the fallback qmlscene
Allows to browse for binaries on the target instead of having to
specify a proper fully qualified remote path manually.
Change-Id: Iaf9dc5c4fe921a7188ef2178f10403fa01e69d03
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 50f6afe4d0a8d152bcab7b5fa3c7b7583a9cfa3c)
Reviewed-by: hjk <hjk@qt.io>
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 3e5d648d52..ee5327cac0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -74,7 +74,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) m_qmlViewerAspect = addAspect<StringAspect>(); m_qmlViewerAspect->setLabelText(tr("QML Viewer:")); m_qmlViewerAspect->setPlaceHolderText(commandLine().executable().toString()); - m_qmlViewerAspect->setDisplayStyle(StringAspect::LineEditDisplay); + m_qmlViewerAspect->setDisplayStyle(StringAspect::PathChooserDisplay); m_qmlViewerAspect->setHistoryCompleter("QmlProjectManager.viewer.history"); auto argumentAspect = addAspect<ArgumentsAspect>(macroExpander()); @@ -157,9 +157,10 @@ QString QmlProjectRunConfiguration::disabledReason() const FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const { - const QString qmlViewer = m_qmlViewerAspect->value(); + // Give precedence to the manual override. + const FilePath qmlViewer = m_qmlViewerAspect->filePath(); if (!qmlViewer.isEmpty()) - return FilePath::fromString(qmlViewer); + return qmlViewer; Kit *kit = target()->kit(); QtVersion *version = QtKitAspect::qtVersion(kit); |