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

Android: Fix sdkmanager timing out on slower machines

Browse Source 
sdkmanager times out on slower machines or with slower network
connection. Increase the timeout and show timeout message box

Task-number: QTCREATORBUG-18458
Change-Id: I9118024ec1438ef9c18842df2f7431e696c73f92
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Vikas Pachdha
2017-07-24 15:27:19 +02:00
parent 7d8847101d
commit 3881ff94f7
6 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,16 +97,22 @@ AndroidToolManager::~AndroidToolManager()
}
SdkPlatformList AndroidToolManager::availableSdkPlatforms() const
SdkPlatformList AndroidToolManager::availableSdkPlatforms(bool *ok) const
{
bool success = false;
SdkPlatformList list;
QString targetListing;
if (androidToolCommand(m_config.androidToolPath(), QStringList({"list", "target"}),
androidToolEnvironment(), &targetListing)) {
m_parser->parseTargetListing(targetListing, m_config.sdkLocation(), &list);
success = true;
} else {
qCDebug(androidToolLog) << "Android tool target listing failed";
}
if (ok)
*ok = success;
return list;
}