diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index ca66e26576f..c0001e7a39f 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -1014,10 +1014,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);