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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Change-Id: I3d3dfa04124eed14952294c2847b9851dcb1a5fd
This commit is contained in:
Eike Ziller
2021-05-25 16:26:54 +02:00
parent 984d992abf 0980ef7e49
commit dbd4a10d6f
24 changed files with 159 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1019,10 +1019,12 @@ void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdFutureInterface &fi)
AndroidSdkManager::OperationOutput result;
result.type = AndroidSdkManager::LicenseCheck;
const QStringList args = {"--licenses", sdkRootArg(m_config)};
if (!fi.isCanceled())
sdkManagerCommand(m_config, args, m_sdkManager, fi, result, 100.0);
else
if (!fi.isCanceled()) {
const int timeOutS = 4; // Short timeout as workaround for QTCREATORBUG-25667
sdkManagerCommand(m_config, args, m_sdkManager, fi, result, 100.0, true, timeOutS);
} else {
qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
}
fi.reportResult(result);
fi.setProgressValue(100);