From ab152497a0ca31b0cf5173ac180edcd69754b9f3 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 18 May 2018 15:05:46 +0200
Subject: [PATCH] Android: Merge output channels of AVD process

Otherwise, if the process produces a non-0 exit code, we get an error
message with only the stdout, which likely is empty.

Change-Id: I3b84f928cf786015aab499cdc2277d530d243841
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/android/androidavdmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 85351e3228c..44ed85b1706 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -297,6 +297,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
         return false;
     }
     QProcess *avdProcess = new QProcess();
+    avdProcess->setReadChannelMode(QProcess::MergedChannels);
     QObject::connect(avdProcess,
                      static_cast<void (QProcess::*)(int)>(&QProcess::finished),
                      avdProcess,