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

Android: Increase timeout running android.bat

Browse Source 
At some cases, android.bat on Windows running longer.

Change-Id: I53ae90e4d7fea69b603cf8cca8c1f8ee5aa36a6a
Task-number: QTCREATORBUG-14223
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Raphael da Silva Couto
2015-04-07 09:14:45 -03:00
committed by Daniel Teske
parent 96c78e6221
commit a2c770f324
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidconfigurations.cpp
View File

@@ -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;
}