diff options
Diffstat (limited to 'qbs')
-rw-r--r-- | qbs/modules/libclang/functions.js | 3 | ||||
-rw-r--r-- | qbs/modules/qtc/qtc.qbs | 4 |
2 files changed, 4 insertions, 3 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 diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index aa30add4a8..93d08ab97f 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.12.1' + property string qtcreator_display_version: '4.12.2' property string ide_version_major: '4' property string ide_version_minor: '12' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release |