diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f5f8693dd13..e836ba8c3f3 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -673,11 +673,6 @@ QFuture> AndroidConfig::androidVirtualDevicesFuture() return QtConcurrent::run(&AndroidConfig::androidVirtualDevices, androidToolPath().toString(), androidToolEnvironment()); } -QVector AndroidConfig::androidVirtualDevices() const -{ - return androidVirtualDevices(androidToolPath().toString(), androidToolEnvironment()); -} - QVector AndroidConfig::androidVirtualDevices(const QString &androidTool, const Environment &environment) { QVector devices; @@ -685,7 +680,7 @@ QVector AndroidConfig::androidVirtualDevices(const QString &a proc.setProcessEnvironment(environment.toProcessEnvironment()); proc.start(androidTool, QStringList() << QLatin1String("list") << QLatin1String("avd")); // list available AVDs - if (!proc.waitForFinished(10000)) { + if (!proc.waitForFinished(20000)) { proc.terminate(); return devices; } diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 77c9c5a0751..906632bd2d0 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -152,7 +152,6 @@ public: static QVector connectedDevices(const QString &adbToolPath, QString *error = 0); QFuture > androidVirtualDevicesFuture(); - QVector androidVirtualDevices() const; static QVector androidVirtualDevices(const QString &androidTool, const Utils::Environment &environment); QString startAVD(const QString &name) const;