diff options
author | Eike Ziller <[email protected]> | 2024-04-22 12:18:10 +0200 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2024-04-22 12:18:10 +0200 |
commit | e5640386f8118ed97cc7be372aedc06bcb65dbc4 (patch) | |
tree | 9197eef275b882555612ee6d36904cc44ea05973 /src/plugins/android/androidsdkmanager.cpp | |
parent | d91d696e3aff23a085c8b7396fb4fc2382b929e8 (diff) | |
parent | 89682a866e95a9b675b61fc7aa345b8b492bd1d8 (diff) |
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
Diffstat (limited to 'src/plugins/android/androidsdkmanager.cpp')
-rw-r--r-- | src/plugins/android/androidsdkmanager.cpp | 4 |
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)); }); |