Merge remote-tracking branch 'origin/13.0'

 Conflicts:
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I682b330a278a329fc6294baeff6a28040abd10bc

1 files changed, 1 insertions, 3 deletions

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 1de5fc0c8ad..293094cbbe4 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -125,10 +125,8 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
     bool assertionFound = false;
     proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &promise](const QString &out) {
         int progressPercent = parseProgress(out, assertionFound);
-        if (assertionFound) {
+        if (assertionFound)
             proc.stop();
-            proc.waitForFinished();
-        }
         if (progressPercent != -1)
             promise.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota));
     });