feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Better remote engine setup result reporting

Browse Source 
Use one less signal for result passing.

Change-Id: I6209d248fb01056835ef65b91981b9b2747d6f7f
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
hjk
2014-09-15 16:36:58 +02:00
parent db6af3f152
commit 3fb7c81a92
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidanalyzesupport.cpp
View File

@@ -86,8 +86,10 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
}
connect(&m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)),
SLOT(remoteIsRunning()));
connect(m_runner, SIGNAL(remoteProcessStarted(int)),
SLOT(handleRemoteProcessStarted(int)));
connect(m_runner, &AndroidRunner::remoteProcessStarted,
[this](int, int qmlPort) { m_qmlPort = qmlPort; });
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(QString)));
@@ -97,11 +99,6 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
SLOT(handleRemoteOutput(QByteArray)));
}
void AndroidAnalyzeSupport::handleRemoteProcessStarted(int qmlPort)
{
m_qmlPort = qmlPort;
}
void AndroidAnalyzeSupport::handleRemoteProcessFinished(const QString &errorMsg)
{
if (m_runControl)

2
src/plugins/android/androidanalyzesupport.h
View File

@@ -54,8 +54,6 @@ public:
Analyzer::AnalyzerRunControl *runControl);
private slots:
void handleRemoteProcessStarted(int qmlPort);
void handleRemoteProcessFinished(const QString &errorMsg);
void handleRemoteOutput(const QByteArray &output);
void handleRemoteErrorOutput(const QByteArray &output);

2
src/plugins/android/androidrunner.cpp
View File

@@ -184,7 +184,7 @@ void AndroidRunner::checkPID()
QByteArray serverChannel = QByteArray::number(m_qmlPort);
emit remoteServerRunning(serverChannel, m_processPID);
} else if (m_useQmlProfiler) {
emit remoteProcessStarted(m_qmlPort);
emit remoteProcessStarted(-1, m_qmlPort);
} else {
// Start without debugging.
emit remoteProcessStarted(-1, -1);

1
src/plugins/android/androidrunner.h
View File

@@ -64,7 +64,6 @@ public slots:
signals:
void remoteServerRunning(const QByteArray &serverChannel, int pid);
void remoteProcessStarted(int gdbServerPort, int qmlPort);
void remoteProcessStarted(int qmlPort);
void remoteProcessFinished(const QString &errString = QString());
void remoteOutput(const QByteArray &output);