diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 16:04:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 16:04:59 +0100 |
| commit | 4026864f38488d40c5bf11310f8192b525373456 (patch) | |
| tree | 4fc1dcc6431259a950c91c2db2ed4fb1c77a6991 /qbs | |
| parent | 6e17882bfc1c0ea5cc3f9e09ef8739b20153943e (diff) | |
| parent | 82818cb90bde1dcc4dd1fa6c0c2c9608e61429c2 (diff) | |
| download | qt-creator-4026864f38488d40c5bf11310f8192b525373456.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/clangrefactoring/refactoringengine.cpp
src/tools/clangrefactoringbackend/source/symbolfinder.cpp
Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 49f2512423..5ad07af8fa 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,7 +1,7 @@ var Environment = loadExtension("qbs.Environment") var File = loadExtension("qbs.File") var FileInfo = loadExtension("qbs.FileInfo") -var MinimumLLVMVersion = "3.8.0" +var MinimumLLVMVersion = "3.9.0" var Process = loadExtension("qbs.Process") function readOutput(executable, args) @@ -28,7 +28,7 @@ function llvmConfig(qbs, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-3.8", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" + "llvm-config", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR |