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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
This commit is contained in:
Orgad Shaneh
2016-07-29 16:12:02 +03:00
parent cda7a3188f 5c5197d19d
commit 35d7352b3e
289 changed files with 1567 additions and 698 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());
connect(runControl, &AnalyzerRunControl::finished,
connect(runControl, &AnalyzerRunControl::finished, runner,
[runner]() { runner->stop(); });
connect(runControl, &AnalyzerRunControl::starting,
connect(runControl, &AnalyzerRunControl::starting, runner,
[runner]() { runner->start(); });
connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, this,
[this, runControl](Utils::Port) {
runControl->notifyRemoteSetupDone(m_qmlPort);
});
connect(runner, &AndroidRunner::remoteProcessStarted,
connect(runner, &AndroidRunner::remoteProcessStarted, this,
[this](Utils::Port, Utils::Port qmlPort) {
m_qmlPort = qmlPort;
});
connect(runner, &AndroidRunner::remoteProcessFinished,
connect(runner, &AndroidRunner::remoteProcessFinished, this,
[this, runControl](const QString &errorMsg) {
runControl->notifyRemoteFinished();
runControl->appendMessage(errorMsg, Utils::NormalMessageFormat);
});
connect(runner, &AndroidRunner::remoteErrorOutput,
connect(runner, &AndroidRunner::remoteErrorOutput, this,
[this, runControl](const QString &msg) {
runControl->appendMessage(msg, Utils::StdErrFormatSameLine);
m_outputParser.processOutput(msg);
});
connect(runner, &AndroidRunner::remoteOutput,
connect(runner, &AndroidRunner::remoteOutput, this,
[this, runControl](const QString &msg) {
runControl->appendMessage(msg, Utils::StdOutFormatSameLine);
m_outputParser.processOutput(msg);