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

Merge remote-tracking branch 'origin/13.0'

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

Change-Id: I682b330a278a329fc6294baeff6a28040abd10bc
This commit is contained in:
Eike Ziller
2024-04-22 12:18:10 +02:00
parent d91d696e3a 89682a866e
commit e5640386f8
20 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));
});