From 87b39ddd5a2352c67eabe4955c0735c2ec72b418 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 7 Dec 2016 16:48:26 +0200 Subject: [PATCH] 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 --- src/plugins/android/androidrunner.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index f3110db2da6..81bea64acfd 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")