diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-08-05 17:28:47 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-08-07 08:19:51 +0000 |
| commit | 1ecadd7d76432f12ee983386af30f64b352f3380 (patch) | |
| tree | b04a9277c39a283230bfdf082f85fdd79ee4be99 /src/plugins/clangcodemodel/semanticmarker.cpp | |
| parent | 295b11d0990124158e78dab93ba57cd9da693c2b (diff) | |
| download | qt-creator-1ecadd7d76432f12ee983386af30f64b352f3380.tar.gz | |
Clang: Filter out "#include_next in primary source file" warning for headers
Another diagnostic that can't be turned off.
Change-Id: I1e4452ccbb2f1864e1a68cf02a858d410cd0c162
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangcodemodel/semanticmarker.cpp')
| -rw-r--r-- | src/plugins/clangcodemodel/semanticmarker.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/semanticmarker.cpp b/src/plugins/clangcodemodel/semanticmarker.cpp index cb17346d10..274e28e5ca 100644 --- a/src/plugins/clangcodemodel/semanticmarker.cpp +++ b/src/plugins/clangcodemodel/semanticmarker.cpp @@ -134,10 +134,12 @@ static void appendDiagnostic(const CXDiagnostic &diag, static bool isBlackListedDiagnostic(const Utils::MimeType &mimeType, const QString &diagnostic) { - static QString pragmaOnceInMainFile = QLatin1String("#pragma once in main file"); + static const QStringList blackList { + QLatin1String("#pragma once in main file"), + QLatin1String("#include_next in primary source file") + }; - return diagnostic == pragmaOnceInMainFile - && mimeType.inherits(QLatin1String("text/x-chdr")); + return mimeType.inherits(QLatin1String("text/x-chdr")) && blackList.contains(diagnostic); } QList<Diagnostic> SemanticMarker::diagnostics() const |