ProjectExplorer: Update "generic" run configuration aspects

None of the run configuration aspects that are added to each runconfig
depend on the actual runconfig, only two need the target, the rest
nothing at all. So use target as common denominator.

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

7 files changed, 9 insertions, 10 deletions

diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 93c109df0c..9428954cfa 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -208,8 +208,8 @@ void DebuggerRunConfigWidget::useMultiProcessToggled(bool on)
     \class Debugger::DebuggerRunConfigurationAspect
 */
 
-DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(RunConfiguration *rc)
-    : m_target(rc->target())
+DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
+    : m_target(target)
 {
     setId("DebuggerAspect");
     setDisplayName(tr("Debugger settings"));
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.h b/src/plugins/debugger/debuggerrunconfigurationaspect.h
index 08ddd8f9cb..f3088e2707 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.h
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.h
@@ -55,7 +55,7 @@ class DEBUGGER_EXPORT DebuggerRunConfigurationAspect
     Q_OBJECT
 
 public:
-    DebuggerRunConfigurationAspect(ProjectExplorer::RunConfiguration *runConfiguration);
+    DebuggerRunConfigurationAspect(ProjectExplorer::Target *target);
 
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index d39f7d06a4..ec55a0c3e8 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -229,7 +229,7 @@ RunConfiguration::RunConfiguration(Target *target, Core::Id id)
             [this] { return displayName(); }, false);
 
     for (const AspectFactory &factory : theAspectFactories)
-        m_aspects.append(factory(this));
+        m_aspects.append(factory(target));
 }
 
 RunConfiguration::~RunConfiguration()
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 55cf9e504b..badc0fd0f2 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -228,10 +228,10 @@ public:
     static RunConfiguration *startupRunConfiguration();
     virtual bool canRunForNode(const ProjectExplorer::Node *) const { return false; }
 
-    using AspectFactory = std::function<IRunConfigurationAspect *(RunConfiguration *)>;
+    using AspectFactory = std::function<IRunConfigurationAspect *(Target *)>;
     template <class T> static void registerAspect()
     {
-        addAspectFactory([](RunConfiguration *rc) { return new T(rc); });
+        addAspectFactory([](Target *target) { return new T(target); });
     }
 
 signals:
diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
index 352423c891..4631b7755d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
@@ -33,8 +33,7 @@
 namespace QmlProfiler {
 namespace Internal {
 
-QmlProfilerRunConfigurationAspect::QmlProfilerRunConfigurationAspect(
-        ProjectExplorer::RunConfiguration *)
+QmlProfilerRunConfigurationAspect::QmlProfilerRunConfigurationAspect(ProjectExplorer::Target *)
 {
     setProjectSettings(new QmlProfilerSettings);
     setGlobalSettings(QmlProfilerPlugin::globalSettings());
diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h
index 308fb6e3a0..7a175d31d2 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h
+++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h
@@ -33,7 +33,7 @@ namespace Internal {
 class QmlProfilerRunConfigurationAspect : public ProjectExplorer::IRunConfigurationAspect
 {
 public:
-    QmlProfilerRunConfigurationAspect(ProjectExplorer::RunConfiguration *);
+    QmlProfilerRunConfigurationAspect(ProjectExplorer::Target *);
 };
 
 } // Internal
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 9a4158b081..fe6b2aacad 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -92,7 +92,7 @@ private:
 class ValgrindRunConfigurationAspect : public IRunConfigurationAspect
 {
 public:
-    ValgrindRunConfigurationAspect(RunConfiguration *)
+    ValgrindRunConfigurationAspect(Target *)
     {
         setProjectSettings(new ValgrindProjectSettings);
         setGlobalSettings(ValgrindPlugin::globalSettings());