From 17c04dccc0cce33cdc78d6885430229c2c2b1abc Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 15 Jul 2015 16:16:41 +0200 Subject: [PATCH] Android: Compare typeId() to the correct constant Broken in e6d1141e1e524cce1bb43a1a859bfbd5441c02d8, which changed the code to use typeId() instead of type() but didn't change to what it was compared. Change-Id: I5b4f76395bd193ee30ee606023483d3bd0b062e8 Reviewed-by: Tobias Hunger --- src/plugins/android/androidconfigurations.cpp | 10 +++++----- src/plugins/android/androidconstants.h | 1 - src/plugins/android/androidgdbserverkitinformation.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 05e7965ac9a..a472331e12e 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1218,9 +1218,9 @@ static bool equalKits(Kit *a, Kit *b) ToolChain *btc = ToolChainKitInformation::toolChain(b); if (atc == btc) return true; - if (!atc || atc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE) + if (!atc || atc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) return false; - if (!btc || btc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE) + if (!btc || btc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) return false; AndroidToolChain *aatc = static_cast(atc); AndroidToolChain *bbtc = static_cast(btc); @@ -1252,7 +1252,7 @@ void AndroidConfigurations::registerNewToolChains() void AndroidConfigurations::removeOldToolChains() { foreach (ToolChain *tc, ToolChainManager::toolChains()) { - if (tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE) { + if (tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID) { if (!tc->isValid()) ToolChainManager::deregisterToolChain(tc); } @@ -1268,7 +1268,7 @@ void AndroidConfigurations::updateAutomaticKitList() foreach (ToolChain *tc, ToolChainManager::toolChains()) { if (!tc->isAutoDetected()) continue; - if (tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE) + if (tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) continue; if (!tc->isValid()) // going to be deleted continue; @@ -1369,7 +1369,7 @@ void AndroidConfigurations::updateAutomaticKitList() foreach (Kit *k, existingKits) { ToolChain *tc = ToolChainKitInformation::toolChain(k); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); - if (tc && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE + if (tc && tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID && tc->isValid() && qtVersion && qtVersion->type() == QLatin1String(Constants::ANDROIDQT)) { k->makeUnSticky(); diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index a0ac1510510..a9cdb69be9d 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -58,7 +58,6 @@ const char ANDROID_SETTINGS_CATEGORY[] = "XA.Android"; const char ANDROID_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Android", "Android"); const char ANDROID_SETTINGS_CATEGORY_ICON[] = ":/android/images/QtAndroid.png"; const char ANDROID_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Android"; -const char ANDROID_TOOLCHAIN_TYPE[] = "androidgcc"; const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android"; const char ANDROID_DEVICE_TYPE[] = "Android.Device.Type"; diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index 55b8f895ad4..7c0fb9498b0 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -90,7 +90,7 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit) ToolChain *tc = ToolChainKitInformation::toolChain(kit); if (qt && tc) return qt->type() == QLatin1String(Constants::ANDROIDQT) - && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE; + && tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID; return false; } @@ -108,7 +108,7 @@ void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbSe FileName AndroidGdbServerKitInformation::autoDetect(Kit *kit) { ToolChain *tc = ToolChainKitInformation::toolChain(kit); - if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE) + if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) return FileName(); AndroidToolChain *atc = static_cast(tc); return atc->suggestedGdbServer();