From a9d2e14dca0a04e261634b0b34b394aa7f66a29f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 23 May 2019 18:10:34 +0200 Subject: ProjectExplorer: Add executable() accessor to RunConfiguration Amends f6c276daf0, which was a quick fix for 4.9. Change-Id: I94281af6a9a0d0bfe197ce836488f708d5bd677d Reviewed-by: hjk --- src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 11 ++++++----- src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/plugins/qmlprojectmanager') diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 5c2f512822..fa4625c535 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -298,9 +298,11 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) return envModifier(Environment()); }); + setExecutableGetter([this] { return FileName::fromString(theExecutable()); }); + m_qmlViewerAspect = addAspect(); m_qmlViewerAspect->setLabelText(tr("QML Viewer:")); - m_qmlViewerAspect->setPlaceHolderText(executable()); + m_qmlViewerAspect->setPlaceHolderText(executable().toString()); m_qmlViewerAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); m_qmlViewerAspect->setHistoryCompleter("QmlProjectManager.viewer.history"); @@ -314,7 +316,6 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) this, &QmlProjectRunConfiguration::updateEnabledState); setOutputFormatter(); - connect(target, &Target::kitChanged, this, &QmlProjectRunConfiguration::updateEnabledState); @@ -325,7 +326,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) Runnable QmlProjectRunConfiguration::runnable() const { Runnable r; - r.executable = executable(); + r.executable = executable().toString(); r.commandLineArguments = commandLineArguments(); r.environment = aspect()->environment(); r.workingDirectory = static_cast(project())->targetDirectory(target()).toString(); @@ -338,7 +339,7 @@ QString QmlProjectRunConfiguration::disabledReason() const return tr("No script file to execute."); if (DeviceTypeKitAspect::deviceTypeId(target()->kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE - && !QFileInfo::exists(executable())) { + && !executable().exists()) { return tr("No qmlscene found."); } if (executable().isEmpty()) @@ -346,7 +347,7 @@ QString QmlProjectRunConfiguration::disabledReason() const return RunConfiguration::disabledReason(); } -QString QmlProjectRunConfiguration::executable() const +QString QmlProjectRunConfiguration::theExecutable() const { const QString qmlViewer = m_qmlViewerAspect->value(); if (!qmlViewer.isEmpty()) diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index adfd3103a7..8a18fd0ef9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -47,7 +47,7 @@ private: void updateEnabledState() final; QString mainScript() const; - QString executable() const; + QString theExecutable() const; QString commandLineArguments() const; ProjectExplorer::BaseStringAspect *m_qmlViewerAspect; -- cgit v1.2.1