diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-12-07 16:48:26 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2016-12-07 15:37:03 +0000 |
| commit | 87b39ddd5a2352c67eabe4955c0735c2ec72b418 (patch) | |
| tree | 856e3ef8521774345bbe1434bd04a83e8ed0a09c | |
| parent | 572396773beb2b21bcfeea5165221170ea033c0c (diff) | |
| download | qt-creator-87b39ddd5a2352c67eabe4955c0735c2ec72b418.tar.gz | |
Android: Merge stdout & stderr channles
On Android 7.1.1 the error is fired on "stderr" on previous versions on
"stdout"
Change-Id: I72c06694a22084d455e26eea95ddfdb8a93a39b2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index f3110db2da..81bea64acf 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -668,8 +668,9 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) logcatReadStandardOutput(); QTC_ASSERT(!m_psIsAlive, /**/); m_psIsAlive.reset(new QProcess); - connect(m_psIsAlive.get(), &QIODevice::readyRead, [this](){ - if (!m_psIsAlive->readAllStandardOutput().simplified().isEmpty()) + m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels); + connect(m_psIsAlive.get(), &QProcess::readyRead, [this](){ + if (!m_psIsAlive->readAll().simplified().isEmpty()) onProcessIdChanged(-1); }); m_psIsAlive->start(m_adb, selector() << QStringLiteral("shell") |