diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-06-23 14:13:37 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-06-26 11:11:07 +0200 |
| commit | 9d5ff46534776d9e96a9553d1c3b154b296513f4 (patch) | |
| tree | eb53e6c4b532cb16bf8bf5c6bd9525596a301555 /src/plugins/android/androidconfigurations.cpp | |
| parent | 5d7963d992185df6259e9a73160ef2e4de5ee8b1 (diff) | |
| download | qt-creator-9d5ff46534776d9e96a9553d1c3b154b296513f4.tar.gz | |
Android: Increase timeout for adb to 10s
On some machines adb takes a longer than 5s to finish. The reasons for
that are unknown.
Change-Id: I949dc40b8f407aa98be0456df47a9ebe88e230a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/android/androidconfigurations.cpp')
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 70890dfc79..b2021b34a1 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -460,7 +460,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const QVector<AndroidDeviceInfo> devices; QProcess adbProc; adbProc.start(adbToolPath().toString(), QStringList() << QLatin1String("devices")); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); if (error) *error = QApplication::translate("AndroidConfiguration", @@ -729,7 +729,7 @@ bool AndroidConfig::isBootToQt(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return false; } @@ -745,7 +745,7 @@ int AndroidConfig::getSDKVersion(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return -1; } @@ -768,7 +768,7 @@ QString AndroidConfig::getProductModel(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return device; } @@ -788,7 +788,7 @@ bool AndroidConfig::hasFinishedBooting(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return false; } @@ -811,7 +811,7 @@ QStringList AndroidConfig::getAbis(const QString &device) const QProcess adbProc; adbProc.start(adbToolPath().toString(), arguments); - if (!adbProc.waitForFinished(5000)) { + if (!adbProc.waitForFinished(10000)) { adbProc.kill(); return result; } |