diff options
| author | hjk <hjk@qt.io> | 2019-06-14 11:12:19 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-06-14 09:42:09 +0000 |
| commit | 3c927426055c351108f35515058173bcf3588c2e (patch) | |
| tree | 2a0f70330c09a6292c89ed0cdd4ceda7154a50be /src/plugins/android/androidtoolchain.cpp | |
| parent | 6796a5edcd3ccd0d5e0cbaaf6c06ab0e6f9aa544 (diff) | |
| download | qt-creator-3c927426055c351108f35515058173bcf3588c2e.tar.gz | |
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 <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/android/androidtoolchain.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 47986fca3a..c8b72178b8 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) { } |