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

Android: Add context objects for QObject::connect with functors

Browse Source 
If several threads can be involved in the signal/slot exchange we need
to show the receiver objects to connect() so that the signals can be
queued when necessary.

Change-Id: I24b4fe90095ce10eeeff9618faff97bd9d05c6eb
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Ulf Hermann
2016-07-27 15:51:20 +02:00
parent bce5aca625
commit 659b0b4788
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,35 +72,35 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
auto runner = new AndroidRunner(this, runConfig, runControl->runMode()); auto runner = new AndroidRunner(this, runConfig, runControl->runMode());
connect(runControl, &AnalyzerRunControl::finished, connect(runControl, &AnalyzerRunControl::finished, runner,
[runner]() { runner->stop(); }); [runner]() { runner->stop(); });
connect(runControl, &AnalyzerRunControl::starting, connect(runControl, &AnalyzerRunControl::starting, runner,
[runner]() { runner->start(); }); [runner]() { runner->start(); });
connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, this,
[this, runControl](Utils::Port) { [this, runControl](Utils::Port) {
runControl->notifyRemoteSetupDone(m_qmlPort); runControl->notifyRemoteSetupDone(m_qmlPort);
}); });
connect(runner, &AndroidRunner::remoteProcessStarted, connect(runner, &AndroidRunner::remoteProcessStarted, this,
[this](Utils::Port, Utils::Port qmlPort) { [this](Utils::Port, Utils::Port qmlPort) {
m_qmlPort = qmlPort; m_qmlPort = qmlPort;
}); });
connect(runner, &AndroidRunner::remoteProcessFinished, connect(runner, &AndroidRunner::remoteProcessFinished, this,
[this, runControl](const QString &errorMsg) { [this, runControl](const QString &errorMsg) {
runControl->notifyRemoteFinished(); runControl->notifyRemoteFinished();
runControl->appendMessage(errorMsg, Utils::NormalMessageFormat); runControl->appendMessage(errorMsg, Utils::NormalMessageFormat);
}); });
connect(runner, &AndroidRunner::remoteErrorOutput, connect(runner, &AndroidRunner::remoteErrorOutput, this,
[this, runControl](const QString &msg) { [this, runControl](const QString &msg) {
runControl->appendMessage(msg, Utils::StdErrFormatSameLine); runControl->appendMessage(msg, Utils::StdErrFormatSameLine);
m_outputParser.processOutput(msg); m_outputParser.processOutput(msg);
}); });
connect(runner, &AndroidRunner::remoteOutput, connect(runner, &AndroidRunner::remoteOutput, this,
[this, runControl](const QString &msg) { [this, runControl](const QString &msg) {
runControl->appendMessage(msg, Utils::StdOutFormatSameLine); runControl->appendMessage(msg, Utils::StdOutFormatSameLine);
m_outputParser.processOutput(msg); m_outputParser.processOutput(msg);