ProjectExplorer: Remove IRunConfigurationAspect::runConfiguration

... and adapt constructors to not take the now-unneeded
RunConfiguration pointer.

Change-Id: I53ff338f51334ff7b0c22d4bed92bfcfc8225ea7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

3 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
index eca30dc283c..8c85c0553ea 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
@@ -53,8 +53,8 @@ Environment QmlProjectEnvironmentAspect::baseEnvironment() const
     return env;
 }
 
-QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(RunConfiguration *rc, Target *target)
-    : EnvironmentAspect(rc), m_target(target)
+QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(Target *target)
+    : m_target(target)
 {
     if (DeviceTypeKitInformation::deviceTypeId(target->kit())
             == Constants::DESKTOP_DEVICE_TYPE)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
index 2d455ee10bf..65880649fba 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
@@ -34,8 +34,7 @@ class QmlProjectEnvironmentAspect : public ProjectExplorer::EnvironmentAspect
     Q_OBJECT
 
 public:
-    QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc,
-                                ProjectExplorer::Target *target);
+    QmlProjectEnvironmentAspect(ProjectExplorer::Target *target);
 
     Utils::Environment baseEnvironment() const override;
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 696f2ae821c..e59ac1c0812 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -71,7 +71,7 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
 class MainQmlFileAspect : public IRunConfigurationAspect
 {
 public:
-    MainQmlFileAspect(RunConfiguration *rc, QmlProject *project);
+    explicit MainQmlFileAspect(QmlProject *project);
     ~MainQmlFileAspect() { delete m_fileListCombo; }
 
     enum MainScriptSource {
@@ -105,8 +105,8 @@ public:
     QString m_mainScriptFilename;
 };
 
-MainQmlFileAspect::MainQmlFileAspect(RunConfiguration *rc, QmlProject *project)
-    : IRunConfigurationAspect(rc), m_project(project)
+MainQmlFileAspect::MainQmlFileAspect(QmlProject *project)
+    : m_project(project)
 {
     m_scriptFile = M_CURRENT_FILE;