diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
| commit | 227904d4a691b99789f1dc43f9b31d857279c896 (patch) | |
| tree | 37d8477c650560b7a94f508526a3bf93343ecb68 /qbs | |
| parent | 63df649655a857599cc14dbe29a3e1647d927fb9 (diff) | |
| parent | e71c0b7fe206d607c94bda0cd2dc5d7ed249101b (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
Diffstat (limited to 'qbs')
| -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 |