From 7ac0cb6247b11fe835f2bd2b7870226686ddf291 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Mon, 6 May 2013 14:16:23 +0200
Subject: [PATCH] AndroidRunSupport: Fix signals and slots
Change-Id: I59bfbd4669141aa1f215d8f6c6c498a520aed4fb
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
---
src/plugins/android/androidanalyzesupport.cpp | 2 ++
src/plugins/android/androiddebugsupport.cpp | 4 ++++
src/plugins/android/androidrunsupport.cpp | 4 ----
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index 13c31f4039e..652a477e832 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -93,6 +93,8 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
m_runner, SLOT(start()));
}
}
+ connect(m_runner, SIGNAL(remoteProcessStarted(int)),
+ SLOT(handleRemoteProcessStarted(int)));
}
void AndroidAnalyzeSupport::handleRemoteProcessStarted(int qmlPort)
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index c8e50f5d36f..67d3724ead5 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -149,6 +149,10 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
connect(m_engine, SIGNAL(aboutToNotifyInferiorSetupOk()),
m_runner, SLOT(handleRemoteDebuggerRunning()));
}
+ connect(m_runner, SIGNAL(remoteServerRunning(QByteArray,int)),
+ SLOT(handleRemoteServerRunning(QByteArray,int)));
+ connect(m_runner, SIGNAL(remoteProcessStarted(int,int)),
+ SLOT(handleRemoteProcessStarted(int,int)));
}
void AndroidDebugSupport::handleRemoteServerRunning(const QByteArray &serverChannel, int pid)
diff --git a/src/plugins/android/androidrunsupport.cpp b/src/plugins/android/androidrunsupport.cpp
index b4028108d83..f96c0d04546 100644
--- a/src/plugins/android/androidrunsupport.cpp
+++ b/src/plugins/android/androidrunsupport.cpp
@@ -44,10 +44,6 @@ AndroidRunSupport::AndroidRunSupport(AndroidRunConfiguration *runConfig,
connect(m_runControl, SIGNAL(finished()),
m_runner, SLOT(stop()));
- connect(m_runner, SIGNAL(remoteServerRunning(QByteArray,int)),
- SLOT(handleRemoteServerRunning(QByteArray,int)));
- connect(m_runner, SIGNAL(remoteProcessStarted(int,int)),
- SLOT(handleRemoteProcessStarted(int,int)));
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(QString)));
--
GitLab