From 6cc15199640da6e38c7df035ba6628a5a94d490f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 25 Nov 2019 16:57:48 +0100
Subject: [PATCH] Android: Use new runconfiguration aspect update mechanism

Change-Id: I2a05f212cbba4471d66be9537b604b4e5abbc0de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/android/androidrunconfiguration.cpp | 17 +++++++----------
 src/plugins/android/androidrunconfiguration.h   |  3 ---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index 3028b27f71f..a6a52b99f01 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -133,10 +133,14 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
     postStartShellCmdAspect->setSettingsKey("Android.PostStartShellCmdListKey");
     postStartShellCmdAspect->setLabel(tr("Shell commands to run on Android device after application quits."));
 
-    connect(target, &Target::buildSystemUpdated, this, [this] {
-        updateTargetInformation();
-        AndroidManager::updateGradleProperties(this->target(), buildKey());
+    setUpdater([this, target] {
+        const BuildTargetInfo bti = buildTargetInfo();
+        setDisplayName(bti.displayName);
+        setDefaultDisplayName(bti.displayName);
+        AndroidManager::updateGradleProperties(target, buildKey());
     });
+
+    connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
 
 QWidget *AndroidRunConfiguration::createConfigurationWidget()
@@ -149,11 +153,4 @@ QWidget *AndroidRunConfiguration::createConfigurationWidget()
     return detailsWidget;
 }
 
-void AndroidRunConfiguration::updateTargetInformation()
-{
-    const BuildTargetInfo bti = buildTargetInfo();
-    setDisplayName(bti.displayName);
-    setDefaultDisplayName(bti.displayName);
-}
-
 } // namespace Android
diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h
index 5d1d32c7e5c..08ef920f8eb 100644
--- a/src/plugins/android/androidrunconfiguration.h
+++ b/src/plugins/android/androidrunconfiguration.h
@@ -69,9 +69,6 @@ public:
     explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
     QWidget *createConfigurationWidget() override;
-
-private:
-    void updateTargetInformation();
 };
 
 } // namespace Android