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

AndroidAnalyzeSupport: Notify engine when remote is running

Browse Source 
Change-Id: Ia04d7b16d4486be60114c148d118d6c9cb0d583f
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
This commit is contained in:
Aurindam Jana
2013-07-22 16:10:27 +02:00
parent ef251dc032
commit 9cf063f4b5
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,8 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati
AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
AnalyzerRunControl *runControl)
: AndroidRunSupport(runConfig, runControl),
m_engine(0)
m_engine(0),
m_qmlPort(0)
{
if (runControl) {
m_engine = runControl->engine();
@@ -93,6 +94,8 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
m_runner, SLOT(start()));
}
}
connect(&m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)),
SLOT(remoteIsRunning()));
connect(m_runner, SIGNAL(remoteProcessStarted(int)),
SLOT(handleRemoteProcessStarted(int)));
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
@@ -106,16 +109,17 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
void AndroidAnalyzeSupport::handleRemoteProcessStarted(int qmlPort)
{
if (m_engine)
m_engine->notifyRemoteSetupDone(qmlPort);
m_qmlPort = qmlPort;
}
void AndroidAnalyzeSupport::handleRemoteOutput(const QByteArray &output)
{
const QString msg = QString::fromUtf8(output);
if (m_engine)
m_engine->logApplicationMessage(QString::fromUtf8(output), Utils::StdOutFormatSameLine);
m_engine->logApplicationMessage(msg, Utils::StdOutFormatSameLine);
else
AndroidRunSupport::handleRemoteOutput(output);
m_outputParser.processOutput(msg);
}
void AndroidAnalyzeSupport::handleRemoteErrorOutput(const QByteArray &output)
@@ -126,5 +130,11 @@ void AndroidAnalyzeSupport::handleRemoteErrorOutput(const QByteArray &output)
AndroidRunSupport::handleRemoteErrorOutput(output);
}
void AndroidAnalyzeSupport::remoteIsRunning()
{
if (m_engine)
m_engine->notifyRemoteSetupDone(m_qmlPort);
}
} // namespace Internal
} // namespace Android