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

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source
This commit is contained in:
Eike Ziller
2013-06-25 09:52:11 +02:00
parent 728fe7d7c0 1477729aa0
commit c59ba462ad
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,8 @@ AndroidRunner::AndroidRunner(QObject *parent,
QByteArray which = psProc.readAll();
m_isBusyBox = which.startsWith("busybox");
m_checkPIDTimer.setInterval(1000);
connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardOutput()), SLOT(logcatReadStandardOutput()));
connect(&m_adbLogcatProcess, SIGNAL(readyReadStandardError()), SLOT(logcatReadStandardError()));
connect(&m_checkPIDTimer, SIGNAL(timeout()), SLOT(checkPID()));
@@ -154,8 +156,10 @@ void AndroidRunner::checkPID()
return;
QByteArray psOut = runPs();
m_processPID = extractPid(m_packageName, psOut);
if (m_processPID == -1)
if (m_processPID == -1) {
m_checkPIDTimer.stop();
emit remoteProcessFinished(tr("\n\n'%1' died.").arg(m_packageName));
}
}
void AndroidRunner::forceStop()
@@ -186,7 +190,6 @@ void AndroidRunner::start()
{
m_adbLogcatProcess.start(m_adb, selector() << _("logcat"));
m_wasStarted = false;
m_checkPIDTimer.start(1000); // check if the application is alive every 1 seconds
QtConcurrent::run(this, &AndroidRunner::asyncStart);
}
@@ -300,6 +303,8 @@ void AndroidRunner::asyncStart()
return;
}
QMetaObject::invokeMethod(&m_checkPIDTimer, "start");
m_wasStarted = true;
if (m_useCppDebugger) {
// This will be funneled to the engine to actually start and attach