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

Clang: Add more CLANG-UPGRADE-CHECK markers

Browse Source 
Change-Id: I9ee553f29fa7a7f60291e2d7d2a56062dc722b9d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-16 09:16:22 +02:00
parent 0c0c10b167
commit f19facd378
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/modules/libclang/functions.js
View File

@@ -1,7 +1,7 @@
var Environment = require("qbs.Environment")
var File = require("qbs.File")
var FileInfo = require("qbs.FileInfo")
var MinimumLLVMVersion = "3.9.0"
var MinimumLLVMVersion = "3.9.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers.
var Process = require("qbs.Process")
function readOutput(executable, args)

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

@@ -237,14 +237,14 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension
opts << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98"));
break;
case ProjectPart::CXX03:
// Clang 3.6 does not know -std=gnu++03.
// CLANG-UPGRADE-CHECK: Clang 3.6/3.9 does not know -std=gnu++03, but 5.0 does.
opts << QLatin1String("-std=c++03");
break;
case ProjectPart::CXX14:
opts << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14"));
break;
case ProjectPart::CXX17:
// TODO: Change to (probably) "gnu++17"/"c++17" at some point in the future.
// CLANG-UPGRADE-CHECK: Change to "gnu++17"/"c++17" for clang 5.0.
opts << (gnuExtensions ? QLatin1String("-std=gnu++1z") : QLatin1String("-std=c++1z"));
break;
}

2
tests/unit/unittest/highlightingmarks-test.cpp
View File

@@ -1169,7 +1169,7 @@ TEST_F(HighlightingMarks, PreprocessorInclusionDirectiveWithKeyword)
ASSERT_THAT(infos[3], HasOnlyType(HighlightingType::StringLiteral));
}
// This test should pass once https://bugs.llvm.org//show_bug.cgi?id=12972 is resolved.
// CLANG-UPGRADE-CHECK: Enable once https://bugs.llvm.org//show_bug.cgi?id=12972 is resolved.
TEST_F(HighlightingMarks, DISABLED_VariableInOperatorFunctionCall)
{
const auto infos = translationUnit.highlightingMarksInRange(sourceRange(566, 12));