From 694f465afb3007cf2956228f08a4ae818fedd1e4 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Tue, 7 May 2013 09:58:32 +0200
Subject: [PATCH] AndroidRunSupport: Connect Signals to correct slots
Change-Id: Ib14ace6b66b78c5f74984a929a6a02c292e35127
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
---
src/plugins/android/androidanalyzesupport.cpp | 7 +++++++
src/plugins/android/androiddebugsupport.cpp | 7 +++++++
src/plugins/android/androidrunsupport.cpp | 8 --------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index 3fcece790e5..9d64682c4b4 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -95,6 +95,13 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
}
connect(m_runner, SIGNAL(remoteProcessStarted(int)),
SLOT(handleRemoteProcessStarted(int)));
+ connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
+ SLOT(handleRemoteProcessFinished(QString)));
+
+ connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)),
+ SLOT(handleRemoteErrorOutput(QByteArray)));
+ connect(m_runner, SIGNAL(remoteOutput(QByteArray)),
+ SLOT(handleRemoteOutput(QByteArray)));
}
void AndroidAnalyzeSupport::handleRemoteProcessStarted(int qmlPort)
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 67d3724ead5..0dc5a9aa247 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -153,6 +153,13 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
SLOT(handleRemoteServerRunning(QByteArray,int)));
connect(m_runner, SIGNAL(remoteProcessStarted(int,int)),
SLOT(handleRemoteProcessStarted(int,int)));
+ connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
+ SLOT(handleRemoteProcessFinished(QString)));
+
+ connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)),
+ SLOT(handleRemoteErrorOutput(QByteArray)));
+ connect(m_runner, SIGNAL(remoteOutput(QByteArray)),
+ SLOT(handleRemoteOutput(QByteArray)));
}
void AndroidDebugSupport::handleRemoteServerRunning(const QByteArray &serverChannel, int pid)
diff --git a/src/plugins/android/androidrunsupport.cpp b/src/plugins/android/androidrunsupport.cpp
index f96c0d04546..83ee05df598 100644
--- a/src/plugins/android/androidrunsupport.cpp
+++ b/src/plugins/android/androidrunsupport.cpp
@@ -43,14 +43,6 @@ AndroidRunSupport::AndroidRunSupport(AndroidRunConfiguration *runConfig,
{
connect(m_runControl, SIGNAL(finished()),
m_runner, SLOT(stop()));
-
- connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
- SLOT(handleRemoteProcessFinished(QString)));
-
- connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)),
- SLOT(handleRemoteErrorOutput(QByteArray)));
- connect(m_runner, SIGNAL(remoteOutput(QByteArray)),
- SLOT(handleRemoteOutput(QByteArray)));
}
void AndroidRunSupport::handleRemoteProcessFinished(const QString &errorMsg)
--
GitLab