From 3c927426055c351108f35515058173bcf3588c2e Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 14 Jun 2019 11:12:19 +0200 Subject: [PATCH] Android: Rename ANDROID_TOOLCHAIN_ID to ANDROID_TOOLCHAIN_TYPEID That's what it is, and it's the only odd one out currently. Change-Id: If098e2691b9f88fbd5f516cf869e390f43b9ddfa Reviewed-by: BogDan Vatra --- src/plugins/android/androidconfigurations.cpp | 8 ++++---- src/plugins/android/androidconstants.h | 2 +- src/plugins/android/androidgdbserverkitinformation.cpp | 2 +- src/plugins/android/androidmanager.cpp | 2 +- src/plugins/android/androidtoolchain.cpp | 8 ++++---- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 9597051c2f4..cb5354798b8 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -919,7 +919,7 @@ static bool matchToolChain(const ToolChain *atc, const ToolChain *btc) if (!atc || !btc) return false; - if (atc->typeId() != Constants::ANDROID_TOOLCHAIN_ID || btc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) + if (atc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID || btc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) return false; auto aatc = static_cast(atc); @@ -931,7 +931,7 @@ void AndroidConfigurations::registerNewToolChains() { const QList existingAndroidToolChains = ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, - Core::Id(Constants::ANDROID_TOOLCHAIN_ID))); + Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); const QList newToolchains = AndroidToolChainFactory::autodetectToolChainsForNdk(existingAndroidToolChains); foreach (ToolChain *tc, newToolchains) @@ -940,7 +940,7 @@ void AndroidConfigurations::registerNewToolChains() void AndroidConfigurations::removeOldToolChains() { - foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_ID)))) { + foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)))) { if (!tc->isValid()) ToolChainManager::deregisterToolChain(tc); } @@ -1017,7 +1017,7 @@ void AndroidConfigurations::updateAutomaticKitList() const QList toolchains = ToolChainManager::toolChains([](const ToolChain *tc) { return tc->isAutoDetected() && tc->isValid() - && tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID; + && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID; }); for (ToolChain *tc : toolchains) { if (tc->language() != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)) diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index affcd85d574..4621137df5c 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -48,7 +48,7 @@ enum AndroidQemuStatus { namespace Constants { const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations"; -const char ANDROID_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Android"; +const char ANDROID_TOOLCHAIN_TYPEID[] = "Qt4ProjectManager.ToolChain.Android"; const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android"; const char ANDROID_AMSTARTARGS[] = "Android.AmStartArgs"; diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index fdc5946c80b..8414c466e0a 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -127,7 +127,7 @@ void AndroidGdbServerKitAspect::setGdbSever(Kit *kit, const FilePath &gdbServerC FilePath AndroidGdbServerKitAspect::autoDetect(const Kit *kit) { ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) + if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) return FilePath(); auto atc = static_cast(tc); return atc->suggestedGdbServer(); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 7d5a62e3a95..429197eb08a 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -271,7 +271,7 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target) return {}; auto tc = ProjectExplorer::ToolChainKitAspect::toolChain(target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); - if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) + if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) return {}; QJsonObject settings; settings["description"] = "This file is generated by QtCreator to be read by androiddeployqt and should not be modified by hand."; diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 47986fca3aa..c8b72178b85 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -64,7 +64,7 @@ static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, co CToolChainList &alreadyKnown) { ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) { - return tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID + return tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID && tc->language() == lang && tc->targetAbi() == ClangTargets[target] && tc->compilerCommand() == compilerPath; @@ -82,7 +82,7 @@ QString AndroidToolChain::typeDisplayName() const bool AndroidToolChain::isValid() const { return ClangToolChain::isValid() - && typeId() == Constants::ANDROID_TOOLCHAIN_ID + && typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID && targetAbi().isValid() && compilerCommand().isChildOf(AndroidConfigurations::currentConfig().ndkLocation()) && !originalTargetTriple().isEmpty(); @@ -146,7 +146,7 @@ GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const AndroidToolChainFactory::AndroidToolChainFactory() { setDisplayName(tr("Android Clang")); - setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_ID); + setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_TYPEID); setSupportedLanguages({ProjectExplorer::Constants::CXX_LANGUAGE_ID}); setToolchainConstructor([] { return new AndroidToolChain; }); } @@ -218,7 +218,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(CToolChainList // for fromMap AndroidToolChain::AndroidToolChain() - : ClangToolChain(Constants::ANDROID_TOOLCHAIN_ID) + : ClangToolChain(Constants::ANDROID_TOOLCHAIN_TYPEID) { } diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 1444c3d98f7..f4c7635eaba 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -126,11 +126,11 @@ static QStringList toolchainList(const ProjectExplorer::ToolChain *tc) { QStringList list; if (tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID - || (tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_ID + || (tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_TYPEID && tc->compilerCommand().toString().contains("clang"))) { list << QLatin1String("clang") << QLatin1String("llvm") << QLatin1String("gcc"); } else if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID - || tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_ID) { + || tc->typeId() == Android::Constants::ANDROID_TOOLCHAIN_TYPEID) { list << QLatin1String("gcc"); // TODO: Detect llvm-gcc } else if (tc->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) { list << QLatin1String("mingw") << QLatin1String("gcc");