aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-11-09 16:12:35 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-11-12 12:04:27 +0000
commitbc657e9cedef4c372e319d2cb4490298d2ffa0b8 (patch)
treec43503abb424c0ab1115c17a421be7816b686b91
parent03be661fee6394e08d122e22a40b7ba6e3818155 (diff)
Fix qbs build
Don't try to bundle libraries of Qt modules that don't have any. Change-Id: I160d5b030db5ecbfa1b8eebb3babdc6ec7f41883 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/shared/bundledqt/bundledqt.qbs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs
index 434fc10fd..8c90dbbea 100644
--- a/src/shared/bundledqt/bundledqt.qbs
+++ b/src/shared/bundledqt/bundledqt.qbs
@@ -32,6 +32,8 @@ Product {
name: "Qt libraries"
files: !Qt.core.staticBuild ? Array.prototype.concat.apply(
[], Object.getOwnPropertyNames(Qt).map(function(mod) {
+ if (!Qt[mod].hasLibrary)
+ return [];
var fp = Qt[mod].libFilePathRelease;
var fpd = Qt.core.frameworkBuild ? fp + qtDebugLibrarySuffix : Qt[mod].libFilePathDebug;