diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-07-07 15:24:27 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-07-14 14:40:03 +0000 |
commit | e6d1141e1e524cce1bb43a1a859bfbd5441c02d8 (patch) | |
tree | 4b409cf97f93fbc6410ebbe0472a4ee693efed15 /src/plugins/cpptools/cppprojects.cpp | |
parent | 3b364f70e8da6bae634fbf52e1b03a852fd79cc3 (diff) | |
download | qt-creator-e6d1141e1e524cce1bb43a1a859bfbd5441c02d8.tar.gz |
ToolChain: Get rid of type() in favor of typeId()
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppprojects.cpp')
-rw-r--r-- | src/plugins/cpptools/cppprojects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp index 17e197c1cf..664bbc2a77 100644 --- a/src/plugins/cpptools/cppprojects.cpp +++ b/src/plugins/cpptools/cppprojects.cpp @@ -113,7 +113,7 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc, } toolchainDefines = tc->predefinedMacros(commandLineFlags); - toolchainType = tc->type(); + toolchainType = tc->typeId(); updateLanguageFeatures(); } @@ -711,7 +711,7 @@ bool CompilerOptionsBuilder::excludeDefineLine(const QByteArray &defineLine) con // The right-hand sides are gcc built-ins that clang does not understand, and they'd // override clang's own (non-macro, it seems) definitions of the symbols on the left-hand // side. - const bool isGccToolchain = m_projectPart->toolchainType == QLatin1String("gcc"); + const bool isGccToolchain = m_projectPart->toolchainType == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID; if (isGccToolchain && defineLine.contains("has_include")) return true; |