diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-01 09:58:36 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-01 09:58:36 +0100 |
| commit | ecb9fae785b6cfc06d069a2014cade62264395dd (patch) | |
| tree | 39f6e1e49c02c56266898cc69b0a7401967571b5 /qbs | |
| parent | 6b29198874ab66fb18d0b696478ba6ee247699d4 (diff) | |
| parent | 97631cfdb83654d0aced65d84583303dc4bc245b (diff) | |
| download | qt-creator-ecb9fae785b6cfc06d069a2014cade62264395dd.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 5 | ||||
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 29d093dcad..7d5e4149fc 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -16,7 +16,10 @@ function readOutput(executable, args) function readListOutput(executable, args) { - return readOutput(executable, args).split(/\s+/); + var list = readOutput(executable, args).split(/\s+/); + if (!list[list.length - 1]) + list.pop(); + return list; } function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions) diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 6c77099906..ed754e43da 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -9,6 +9,7 @@ Module { property bool enableUnitTests: false property bool enableProjectFileUpdates: true property bool installApiHeaders: false + property bool enableBundledQt: false property string libInstallDir: qtc.ide_library_path property stringList libRPaths: qbs.targetOS.contains("macos") ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] |