diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
| commit | 546df37c9894c5d444e3c40a21110077b8dc7a44 (patch) | |
| tree | 15e4ac4676373bdd25ccac527baca38706d15368 /qbs | |
| parent | 717ff381401d559a338c1d4613c6af53735dcb91 (diff) | |
| parent | 9650adad140dbcec0ee5f464c2bbcb9d9da05133 (diff) | |
| download | qt-creator-546df37c9894c5d444e3c40a21110077b8dc7a44.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
README.md
src/plugins/modeleditor/actionhandler.cpp
Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 2 | ||||
| -rw-r--r-- | qbs/modules/libclang/functions.js | 5 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index c81d2bdf14..7e2488eb49 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -25,7 +25,7 @@ QtcProduct { name: "Qt.test" } - cpp.createSymlinks: false + cpp.internalVersion: "" cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) cpp.sonamePrefix: qbs.targetOS.contains("osx") ? "@rpath" diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index daa240b853..e09ebef1ee 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,6 +1,6 @@ var Environment = loadExtension("qbs.Environment") var File = loadExtension("qbs.File") -var MinimumLLVMVersion = "3.6.2" +var MinimumLLVMVersion = "3.8.0" var Process = loadExtension("qbs.Process") function readOutput(executable, args) @@ -27,8 +27,7 @@ function llvmConfig(qbs, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-3.2", "llvm-config-3.3", "llvm-config-3.4", - "llvm-config-3.5", "llvm-config-3.6", "llvm-config-4.0", "llvm-config-4.1" + "llvm-config", "llvm-config-3.8", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 5f7e7de1b3..955850dfa9 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -5,13 +5,13 @@ import "qtc.js" as HelperFunctions Module { property string ide_version_major: '4' property string ide_version_minor: '0' - property string ide_version_release: '82' + property string ide_version_release: '83' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' property string ide_compat_version_minor: '0' - property string ide_compat_version_release: '82' + property string ide_compat_version_release: '83' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release |