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

ToolChain: Get rid of type() in favor of typeId()

Browse Source 
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 15:24:27 +02:00
parent 3b364f70e8
commit e6d1141e1e
20 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppprojects.cpp
View File

@@ -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;

2
src/plugins/cpptools/cppprojects.h
View File

@@ -130,7 +130,7 @@ public: // fields
QString projectConfigFile; // currently only used by the Generic Project Manager
QByteArray projectDefines;
QByteArray toolchainDefines;
QString toolchainType;
Core::Id toolchainType;
QList<HeaderPath> headerPaths;
QStringList precompiledHeaders;
LanguageVersion languageVersion;