diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
commit | b193892fd1289bd8a995cd609ead33f925b75ee1 (patch) | |
tree | 4d03bf8ea45a9ab542eb6ab129e56a82b860e19c /qbs/modules/libclang/functions.js | |
parent | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (diff) | |
parent | 13ad8163080153cb5d1ea39238069b5cca8f9651 (diff) |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
Diffstat (limited to 'qbs/modules/libclang/functions.js')
-rw-r--r-- | qbs/modules/libclang/functions.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 0c15a2a628..d03358b3c6 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -37,7 +37,8 @@ function llvmConfig(hostOS, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-7", "llvm-config-8", "llvm-config-9" + // CLANG-UPGRADE-CHECK: Adapt once we require a new minimum version. + "llvm-config", "llvm-config-8", "llvm-config-9", "llvm-config-10", "llvm-config-11", "llvm-config-12" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR |