feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/13.0' into HEAD

Browse Source 
Change-Id: I1f87297930db420606aab8d7016c290483f262c0
This commit is contained in:
Tim Jenssen
2024-04-23 14:03:46 +02:00
parent 2c38f9ae74 facd32b2e0
commit 7dfa746920
55 changed files with 245 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidsdkmanager.cpp
View File

@@ -126,10 +126,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));
});