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

Adapt to upstream API change in CompilerOptionsBuilder III

Browse Source 
excludeDefineLine() can go since the relevant check is now in the base
class (again).

Change-Id: I572586cc8b52cdd3479b84c677149e3c10a6b804
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-06-29 13:16:07 +02:00
parent fafb0cb8d4
commit 33ee3ffcca
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -196,24 +196,6 @@ private:
return CompilerOptionsBuilder::defineOption(); return CompilerOptionsBuilder::defineOption();
} }
bool excludeDefineLine(const QByteArray &defineLine) const override
{
if (CompilerOptionsBuilder::excludeDefineLine(defineLine))
return true;
// gcc 4.9 has:
// #define __has_include(STR) __has_include__(STR)
// #define __has_include_next(STR) __has_include_next__(STR)
// 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");
if (isGccToolchain && defineLine.contains("has_include"))
return true;
return false;
}
private: private:
bool m_isMsvcToolchain; bool m_isMsvcToolchain;
}; };