From f9ff630346cc63941e034139cb9509d0b0daaa41 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 30 Oct 2013 17:02:28 +0100 Subject: [PATCH] Android: Don't create kits if there is no device Task-number: QTCREATORBUG-10574 Change-Id: I169762ce9d2388866f1aa16f2b7128cfd42e7cee Reviewed-by: Daniel Teske --- src/plugins/android/androidconfigurations.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index ee39135f5d6..592847a6b1b 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 newKits;