feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Rename ANDROID_TOOLCHAIN_ID to ANDROID_TOOLCHAIN_TYPEID

Browse Source 
That's what it is, and it's the only odd one out currently.

Change-Id: If098e2691b9f88fbd5f516cf869e390f43b9ddfa
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
hjk
2019-06-14 11:12:19 +02:00
parent 6796a5edcd
commit 3c92742605
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidconfigurations.cpp
View File

@@ -919,7 +919,7 @@ static bool matchToolChain(const ToolChain *atc, const ToolChain *btc)
if (!atc || !btc) if (!atc || !btc)
return false; 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; return false;
auto aatc = static_cast<const AndroidToolChain *>(atc); auto aatc = static_cast<const AndroidToolChain *>(atc);
@@ -931,7 +931,7 @@ void AndroidConfigurations::registerNewToolChains()
{ {
const QList<ToolChain *> existingAndroidToolChains const QList<ToolChain *> existingAndroidToolChains
= ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, = ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId,
Core::Id(Constants::ANDROID_TOOLCHAIN_ID))); Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
const QList<ToolChain *> newToolchains const QList<ToolChain *> newToolchains
= AndroidToolChainFactory::autodetectToolChainsForNdk(existingAndroidToolChains); = AndroidToolChainFactory::autodetectToolChainsForNdk(existingAndroidToolChains);
foreach (ToolChain *tc, newToolchains) foreach (ToolChain *tc, newToolchains)
@@ -940,7 +940,7 @@ void AndroidConfigurations::registerNewToolChains()
void AndroidConfigurations::removeOldToolChains() 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()) if (!tc->isValid())
ToolChainManager::deregisterToolChain(tc); ToolChainManager::deregisterToolChain(tc);
} }
@@ -1017,7 +1017,7 @@ void AndroidConfigurations::updateAutomaticKitList()
const QList<ToolChain *> toolchains = ToolChainManager::toolChains([](const ToolChain *tc) { const QList<ToolChain *> toolchains = ToolChainManager::toolChains([](const ToolChain *tc) {
return tc->isAutoDetected() return tc->isAutoDetected()
&& tc->isValid() && tc->isValid()
&& tc->typeId() == Constants::ANDROID_TOOLCHAIN_ID; && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID;
}); });
for (ToolChain *tc : toolchains) { for (ToolChain *tc : toolchains) {
if (tc->language() != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)) if (tc->language() != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))

2
src/plugins/android/androidconstants.h
View File

@@ -48,7 +48,7 @@ enum AndroidQemuStatus {
namespace Constants { namespace Constants {
const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations"; 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 ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android";
const char ANDROID_AMSTARTARGS[] = "Android.AmStartArgs"; const char ANDROID_AMSTARTARGS[] = "Android.AmStartArgs";

2
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -127,7 +127,7 @@ void AndroidGdbServerKitAspect::setGdbSever(Kit *kit, const FilePath &gdbServerC
FilePath AndroidGdbServerKitAspect::autoDetect(const Kit *kit) FilePath AndroidGdbServerKitAspect::autoDetect(const Kit *kit)
{ {
ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); 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(); return FilePath();
auto atc = static_cast<AndroidToolChain *>(tc); auto atc = static_cast<AndroidToolChain *>(tc);
return atc->suggestedGdbServer(); return atc->suggestedGdbServer();

2
src/plugins/android/androidmanager.cpp
View File

@@ -271,7 +271,7 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target)
return {}; return {};
auto tc = ProjectExplorer::ToolChainKitAspect::toolChain(target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); 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 {}; return {};
QJsonObject settings; QJsonObject settings;
settings["description"] = "This file is generated by QtCreator to be read by androiddeployqt and should not be modified by hand."; settings["description"] = "This file is generated by QtCreator to be read by androiddeployqt and should not be modified by hand.";

8
src/plugins/android/androidtoolchain.cpp
View File

@@ -64,7 +64,7 @@ static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, co
CToolChainList &alreadyKnown) CToolChainList &alreadyKnown)
{ {
ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) { 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->language() == lang
&& tc->targetAbi() == ClangTargets[target] && tc->targetAbi() == ClangTargets[target]
&& tc->compilerCommand() == compilerPath; && tc->compilerCommand() == compilerPath;
@@ -82,7 +82,7 @@ QString AndroidToolChain::typeDisplayName() const
bool AndroidToolChain::isValid() const bool AndroidToolChain::isValid() const
{ {
return ClangToolChain::isValid() return ClangToolChain::isValid()
&& typeId() == Constants::ANDROID_TOOLCHAIN_ID && typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
&& targetAbi().isValid() && targetAbi().isValid()
&& compilerCommand().isChildOf(AndroidConfigurations::currentConfig().ndkLocation()) && compilerCommand().isChildOf(AndroidConfigurations::currentConfig().ndkLocation())
&& !originalTargetTriple().isEmpty(); && !originalTargetTriple().isEmpty();
@@ -146,7 +146,7 @@ GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const
AndroidToolChainFactory::AndroidToolChainFactory() AndroidToolChainFactory::AndroidToolChainFactory()
{ {
setDisplayName(tr("Android Clang")); setDisplayName(tr("Android Clang"));
setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_ID); setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_TYPEID);
setSupportedLanguages({ProjectExplorer::Constants::CXX_LANGUAGE_ID}); setSupportedLanguages({ProjectExplorer::Constants::CXX_LANGUAGE_ID});
setToolchainConstructor([] { return new AndroidToolChain; }); setToolchainConstructor([] { return new AndroidToolChain; });
} }
@@ -218,7 +218,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(CToolChainList
// for fromMap // for fromMap
AndroidToolChain::AndroidToolChain() AndroidToolChain::AndroidToolChain()
: ClangToolChain(Constants::ANDROID_TOOLCHAIN_ID) : ClangToolChain(Constants::ANDROID_TOOLCHAIN_TYPEID)
{ {
} }

4
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -126,11 +126,11 @@ static QStringList toolchainList(const ProjectExplorer::ToolChain *tc)
{ {
QStringList list; QStringList list;
if (tc->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID 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"))) { && tc->compilerCommand().toString().contains("clang"))) {
list << QLatin1String("clang") << QLatin1String("llvm") << QLatin1String("gcc"); list << QLatin1String("clang") << QLatin1String("llvm") << QLatin1String("gcc");
} else if (tc->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID } 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 list << QLatin1String("gcc"); // TODO: Detect llvm-gcc
} else if (tc->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) { } else if (tc->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID) {
list << QLatin1String("mingw") << QLatin1String("gcc"); list << QLatin1String("mingw") << QLatin1String("gcc");