From 684d3e40a707fa5a08c5fc8fc7b18677d603d602 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 25 Nov 2019 18:34:51 +0100
Subject: [PATCH] Python: use new runconfiguration aspect update mechanism

Change-Id: I60807350460e75172bf4744beeb1474755ff4187
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/python/pythonrunconfiguration.cpp | 20 +++++++++----------
 src/plugins/python/pythonrunconfiguration.h   |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index e4fb477d902..17a55959483 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -279,13 +279,19 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Core::Id id)
         return cmd;
     });
 
-    connect(target, &Target::buildSystemUpdated,
-            this, &PythonRunConfiguration::updateTargetInformation);
+    setUpdater([this, scriptAspect] {
+        const BuildTargetInfo bti = buildTargetInfo();
+        const QString script = bti.targetFilePath.toUserOutput();
+        setDefaultDisplayName(tr("Run %1").arg(script));
+        scriptAspect->setValue(script);
+    });
+
+    connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
 
 void PythonRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
 {
-    updateTargetInformation();
+    update();
 }
 
 void PythonRunConfiguration::updateLanguageServer()
@@ -325,14 +331,6 @@ QString PythonRunConfiguration::interpreter() const
     return aspect<InterpreterAspect>()->currentInterpreter().command.toString();
 }
 
-void PythonRunConfiguration::updateTargetInformation()
-{
-    const BuildTargetInfo bti = buildTargetInfo();
-    const QString script = bti.targetFilePath.toUserOutput();
-    setDefaultDisplayName(tr("Run %1").arg(script));
-    aspect<MainScriptAspect>()->setValue(script);
-}
-
 PythonRunConfigurationFactory::PythonRunConfigurationFactory()
 {
     registerRunConfiguration<PythonRunConfiguration>("PythonEditor.RunConfiguration.");
diff --git a/src/plugins/python/pythonrunconfiguration.h b/src/plugins/python/pythonrunconfiguration.h
index 6d5a13683a3..8c00aabf53b 100644
--- a/src/plugins/python/pythonrunconfiguration.h
+++ b/src/plugins/python/pythonrunconfiguration.h
@@ -51,8 +51,6 @@ private:
     bool supportsDebugger() const;
     QString mainScript() const;
     QString arguments() const;
-
-    void updateTargetInformation();
 };
 
 class PythonRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory