summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael da Silva Couto <raphael.couto@gmail.com>2015-04-07 09:14:45 -0300
committerDaniel Teske <daniel.teske@theqtcompany.com>2015-04-07 12:52:40 +0000
commita2c770f3240f92b69bc7878090e2ea40ee24f91d (patch)
treed4a718fbbafabaa3a9a4ed2da812e9b1254d7c4c
parent96c78e622108ccc957a43d27d7884e250b4cbaa1 (diff)
downloadqt-creator-a2c770f3240f92b69bc7878090e2ea40ee24f91d.tar.gz
Android: Increase timeout running android.bat
At some cases, android.bat on Windows running longer. Change-Id: I53ae90e4d7fea69b603cf8cca8c1f8ee5aa36a6a Task-number: QTCREATORBUG-14223 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
-rw-r--r--src/plugins/android/androidconfigurations.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 833de15485..1469afd724 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -380,7 +380,7 @@ void AndroidConfig::updateAvailableSdkPlatforms() const
QProcess proc;
proc.setProcessEnvironment(androidToolEnvironment().toProcessEnvironment());
proc.start(androidToolPath().toString(), QStringList() << QLatin1String("list") << QLatin1String("target")); // list avaialbe AVDs
- if (!proc.waitForFinished(5000)) {
+ if (!proc.waitForFinished(10000)) {
proc.terminate();
return;
}
@@ -671,7 +671,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevicesImpl(const FileNa
proc.setProcessEnvironment(environment.toProcessEnvironment());
proc.start(androidTool.toString(),
QStringList() << QLatin1String("list") << QLatin1String("avd")); // list available AVDs
- if (!proc.waitForFinished(5000)) {
+ if (!proc.waitForFinished(10000)) {
proc.terminate();
return devices;
}