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

CppTools: Apply has_include workaround also for a mingw toolchain

Browse Source 
Change-Id: Ib501b40870f71a552b0bd38fa4977b450fd37954
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2016-03-03 17:38:19 +01:00
parent ef1106a27f
commit 5fcdeb7727
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -227,6 +227,12 @@ QString CompilerOptionsBuilder::defineOption() const
return QLatin1String("-D"); return QLatin1String("-D");
} }
static bool isGccOrMinGwToolchain(const Core::Id &toolchainType)
{
return toolchainType == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| toolchainType == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID;
}
bool CompilerOptionsBuilder::excludeDefineLine(const QByteArray &defineLine) const bool CompilerOptionsBuilder::excludeDefineLine(const QByteArray &defineLine) const
{ {
// This is a quick fix for QTCREATORBUG-11501. // This is a quick fix for QTCREATORBUG-11501.
@@ -240,8 +246,7 @@ bool CompilerOptionsBuilder::excludeDefineLine(const QByteArray &defineLine) con
// The right-hand sides are gcc built-ins that clang does not understand, and they'd // 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 // override clang's own (non-macro, it seems) definitions of the symbols on the left-hand
// side. // side.
const bool isGccToolchain = m_projectPart.toolchainType == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID; if (isGccOrMinGwToolchain(m_projectPart.toolchainType) && defineLine.contains("has_include"))
if (isGccToolchain && defineLine.contains("has_include"))
return true; return true;
return false; return false;