aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidtoolmanager.cpp
diff options
context:
space:
mode:
authorVikas Pachdha <[email protected]>2017-07-24 15:27:19 +0200
committerVikas Pachdha <[email protected]>2017-07-25 09:43:54 +0000
commit3881ff94f7c6386fe43c8e8cc2e47e317a382641 (patch)
tree115499b64e2c2e2a9d16e6a4504bd1ea1fa19e1c /src/plugins/android/androidtoolmanager.cpp
parent7d8847101d4b91c11dc89826b0058257bd1fc95d (diff)
Android: Fix sdkmanager timing out on slower machines
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 <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/android/androidtoolmanager.cpp')
-rw-r--r--src/plugins/android/androidtoolmanager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp
index 19f7cbc97b9..39fa2a2c426 100644
--- a/src/plugins/android/androidtoolmanager.cpp
+++ b/src/plugins/android/androidtoolmanager.cpp
@@ -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;
}