diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-07-14 19:35:48 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-10-11 11:59:46 +0000 |
| commit | e70179e14f5baf680259658b1c022a5a4926db4f (patch) | |
| tree | 394b888f4da2b86c4c16a68d01904e220def82eb /src/plugins/android/androidavdmanager.cpp | |
| parent | daee6f6f33a23b1f423853f3bf6bd558125318b1 (diff) | |
Android: Add API to check whether to use native SDK UI tools
Task-number: QTCREATORBUG-18978
Change-Id: I1cf4749e81b3b49de14ff88a5876569886d2cdfe
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/android/androidavdmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidavdmanager.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index f4cf488616f..5af95e7a260 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -54,8 +54,6 @@ const char avdInfoAbiKey[] = "abi.type"; const char avdInfoTargetKey[] = "target"; const char avdInfoErrorKey[] = "Error:"; -const QVersionNumber avdManagerIntroVersion(25, 3 ,0); - const int avdCreateTimeoutMs = 30000; /*! @@ -219,14 +217,9 @@ AndroidAvdManager::~AndroidAvdManager() } -bool AndroidAvdManager::avdManagerUiToolAvailable() const -{ - return m_config.sdkToolsVersion() < avdManagerIntroVersion; -} - void AndroidAvdManager::launchAvdManagerUiTool() const { - if (avdManagerUiToolAvailable()) { + if (m_config.useNativeUiTools()) { m_androidTool->launchAvdManager(); } else { qCDebug(avdManagerLog) << "AVD Ui tool launch failed. UI tool not available" @@ -236,7 +229,7 @@ void AndroidAvdManager::launchAvdManagerUiTool() const QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const { - if (m_config.sdkToolsVersion() < avdManagerIntroVersion) + if (m_config.useNativeUiTools()) return m_androidTool->createAvd(info); return Utils::runAsync(&createAvdCommand, m_config, info); @@ -244,7 +237,7 @@ QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const bool AndroidAvdManager::removeAvd(const QString &name) const { - if (m_config.sdkToolsVersion() < avdManagerIntroVersion) + if (m_config.useNativeUiTools()) return m_androidTool->removeAvd(name); Utils::SynchronousProcess proc; @@ -257,7 +250,7 @@ bool AndroidAvdManager::removeAvd(const QString &name) const QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const { - if (m_config.sdkToolsVersion() < avdManagerIntroVersion) + if (m_config.useNativeUiTools()) return m_androidTool->androidVirtualDevicesFuture(); return Utils::runAsync(&AvdManagerOutputParser::listVirtualDevices, m_parser.get(), m_config); |