diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-22 09:55:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-22 09:55:58 +0200 |
| commit | d2a9e1b892456b0500bdc79ca749d2bdf02afab5 (patch) | |
| tree | fe10e481a90e2a06c335cf4f9790527dc564bc3c /qbs | |
| parent | a2fe4087ffab6625c81d583d9c2432e63312bcb2 (diff) | |
| parent | dab2045099a4482296d5f46faff4e34f08e32f6a (diff) | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: I00dd929a4ed32af8f1b76cea57a7c49239dafc7c
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 192473391a..beca112787 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 = "5.0.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. +var MinimumLLVMVersion = "6.0.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. var Process = require("qbs.Process") function readOutput(executable, args) @@ -36,7 +36,7 @@ function llvmConfig(hostOS, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-5.0", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", + "llvm-config", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", "llvm-config-9.0" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index eeb233f12a..bb427bc4f8 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -56,8 +56,8 @@ Module { }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags property bool toolingEnabled: !Environment.getEnv("QTC_NO_CLANG_LIBTOOLING") - && Utilities.versionCompare(llvmVersion, "5") > 0 - && Utilities.versionCompare(llvmVersion, "6") < 0 + && Utilities.versionCompare(llvmVersion, "6") > 0 + && Utilities.versionCompare(llvmVersion, "7") < 0 validate: { if (!clangProbe.found) { |