diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
| commit | 88897f3a870de7b756356907801f09a90902e490 (patch) | |
| tree | a947c7fdb92d9050e9ade763dcb87db192b4585e /src/plugins/android/androiddebugsupport.cpp | |
| parent | 8b6eb5aabb48fb83c3cd92be9a77401ca26a810b (diff) | |
| parent | 01b2ed7904132f845819e78c84477ac9a66bd1e3 (diff) | |
| download | qt-creator-88897f3a870de7b756356907801f09a90902e490.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
src/plugins/genericprojectmanager/genericproject.h
src/plugins/genericprojectmanager/genericprojectnodes.cpp
src/plugins/genericprojectmanager/genericprojectnodes.h
Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
Diffstat (limited to 'src/plugins/android/androiddebugsupport.cpp')
| -rw-r--r-- | src/plugins/android/androiddebugsupport.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 76a3493c7e..aaffde81d4 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -180,6 +180,16 @@ AndroidDebugSupport::AndroidDebugSupport(RunControl *runControl) [this](const QString &output) { this->runControl()->showMessage(output, AppOutput); }); + + QTC_ASSERT(runControl, return); + auto formatter = qobject_cast<AndroidOutputFormatter*>(runControl->outputFormatter()); + QTC_ASSERT(formatter, return); + connect(m_runner, &AndroidRunner::pidFound, formatter, &AndroidOutputFormatter::appendPid); + connect(m_runner, &AndroidRunner::pidLost, formatter, &AndroidOutputFormatter::removePid); + connect(m_runner, &AndroidRunner::remoteProcessFinished, formatter, + [formatter] { + formatter->removePid(-1); + }); } void AndroidDebugSupport::handleRemoteProcessStarted(Utils::Port gdbServerPort, Utils::Port qmlPort) |