diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-09-29 13:46:53 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-10-27 14:21:19 +0000 |
| commit | 5ba40cb7fbeb58f2ac1284944f7dda0b3f7bb453 (patch) | |
| tree | ae1986a0254b1e32d32d60505c7c7301163484df /qbs | |
| parent | 6de3eb7a1a441e529549c9097431c2fc16fca90b (diff) | |
Clang: Require LLVM/Clang >= 5.0.0
...for the code model parts and declare 5.0 as the supported version for
the clang static analyzer.
Adapt versions and tests, remove code assuming clang <= 5.0.
LLVM/Clang 5 was released on 07 Sep 2017.
Task-number: QTCREATORBUG-18931
Task-number: QTCREATORBUG-18657
Task-number: QTCREATORBUG-17187
Task-number: QTCREATORBUG-14881
Change-Id: I53b00258ca06a1d2e57f9379dacc54b310687295
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 4 | ||||
| -rw-r--r-- | qbs/modules/libclang/libclang.qbs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 5ea298b954..3b74066562 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,7 +1,7 @@ var Environment = require("qbs.Environment") var File = require("qbs.File") var FileInfo = require("qbs.FileInfo") -var MinimumLLVMVersion = "3.9.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. +var MinimumLLVMVersion = "5.0.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. var Process = require("qbs.Process") function readOutput(executable, args) @@ -33,7 +33,7 @@ function llvmConfig(qbs, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" + "llvm-config", "llvm-config-5.0", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 402e492217..44096275b1 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -50,8 +50,8 @@ Module { }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags property bool toolingEnabled: !Environment.getEnv("QTC_NO_CLANG_LIBTOOLING") - && Utilities.versionCompare(llvmVersion, "3.9") > 0 - && Utilities.versionCompare(llvmVersion, "4") < 0 + && Utilities.versionCompare(llvmVersion, "5") > 0 + && Utilities.versionCompare(llvmVersion, "6") < 0 validate: { if (!clangProbe.found) { |