From 2e15ba2a0b481559830da7b6d13b6e43d5439ada Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Tue, 19 Jan 2016 14:57:16 +0100
Subject: [PATCH] Android: Adapt AndroidAnalyzeSupport to Analyzer changes

Change-Id: Idbb85c0af082318d97e3d68298f4d802d79a2068
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/android/androidanalyzesupport.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index 712b1bb01d0..e84358cf8f8 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -31,7 +31,6 @@
 #include <analyzerbase/ianalyzertool.h>
 #include <analyzerbase/analyzermanager.h>
 #include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
 
 #include <projectexplorer/target.h>
 #include <projectexplorer/project.h>
@@ -49,21 +48,19 @@ namespace Internal {
 RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfiguration *runConfig,
                                                            Core::Id runMode)
 {
-    Target *target = runConfig->target();
-    AnalyzerStartParameters params;
+    AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(runConfig, runMode);
+    QTC_ASSERT(runControl, return 0);
+    AnalyzerConnection connection;
     if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
         QTcpServer server;
         QTC_ASSERT(server.listen(QHostAddress::LocalHost)
                    || server.listen(QHostAddress::LocalHostIPv6), return 0);
-        params.analyzerHost = server.serverAddress().toString();
+        connection.analyzerHost = server.serverAddress().toString();
     }
-
-    AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig, runMode);
-    if (analyzerRunControl) {
-        analyzerRunControl->setDisplayName(AndroidManager::packageName(target));
-        (void) new AndroidAnalyzeSupport(runConfig, analyzerRunControl);
-    }
-    return analyzerRunControl;
+    runControl->setDisplayName(AndroidManager::packageName(runConfig->target()));
+    runControl->setConnection(connection);
+    (void) new AndroidAnalyzeSupport(runConfig, runControl);
+    return runControl;
 }
 
 AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,