summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidconfigurations.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-10-30 17:02:28 +0100
committerDaniel Teske <daniel.teske@digia.com>2013-10-30 17:04:13 +0100
commitf9ff630346cc63941e034139cb9509d0b0daaa41 (patch)
treed925ed199540114db2225f1a237c70eb1d5f61d7 /src/plugins/android/androidconfigurations.cpp
parentf7fa44d48ac7f41cf3add89c23e8cda62119cb5d (diff)
downloadqt-creator-f9ff630346cc63941e034139cb9509d0b0daaa41.tar.gz
Android: Don't create kits if there is no device
Task-number: QTCREATORBUG-10574 Change-Id: I169762ce9d2388866f1aa16f2b7128cfd42e7cee Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android/androidconfigurations.cpp')
-rw-r--r--src/plugins/android/androidconfigurations.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index ee39135f5d..592847a6b1 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -857,7 +857,13 @@ void AndroidConfigurations::updateAutomaticKitList()
}
DeviceManager *dm = DeviceManager::instance();
- IDevice::ConstPtr device = dm->find(Core::Id(Constants::ANDROID_DEVICE_ID)); // should always exist
+ IDevice::ConstPtr device = dm->find(Core::Id(Constants::ANDROID_DEVICE_ID));
+ if (device.isNull()) {
+ // no device, means no sdk path
+ foreach (Kit *k, existingKits)
+ KitManager::deregisterKit(k);
+ return;
+ }
// register new kits
QList<Kit *> newKits;