From 09d24face015539f75392428561cc48f46541389 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 13 Apr 2021 12:44:42 +0200
Subject: [PATCH] QmlProject: Use new RunConfiguration::setRunnableModifier

Change-Id: Idb729996b979effc96d97bfe7220668dfb904bb2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../qmlprojectrunconfiguration.cpp            | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 999f34e426e..4188e28ad87 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -69,15 +69,14 @@ class QmlProjectRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration)
 
 public:
-    QmlProjectRunConfiguration(Target *target, Utils::Id id);
+    QmlProjectRunConfiguration(Target *target, Id id);
 
 private:
-    Runnable runnable() const final;
     QString disabledReason() const final;
     bool isEnabled() const final;
 
     QString mainScript() const;
-    Utils::FilePath qmlScenePath() const;
+    FilePath qmlScenePath() const;
     QString commandLineArguments() const;
 
     StringAspect *m_qmlViewerAspect = nullptr;
@@ -137,20 +136,15 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
         return envModifier(environment);
     });
 
+    setRunnableModifier([this](Runnable &r) {
+        const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(activeBuildSystem());
+        r.workingDirectory = bs->targetDirectory().toString();
+    });
+
     setDisplayName(tr("QML Scene", "QMLRunConfiguration display name."));
     update();
 }
 
-Runnable QmlProjectRunConfiguration::runnable() const
-{
-    Runnable r;
-    r.setCommandLine(commandLine());
-    r.environment = aspect<EnvironmentAspect>()->environment();
-    const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(activeBuildSystem());
-    r.workingDirectory = bs->targetDirectory().toString();
-    return r;
-}
-
 QString QmlProjectRunConfiguration::disabledReason() const
 {
     if (mainScript().isEmpty())