aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-07-12 14:59:10 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-07-12 18:16:07 +0000
commitb689a16ae3adff29f8d8fcf4de305f9b1a67636f (patch)
treee1700c25c9ba3b0ea814fde204f541412e1e265b /src/shared
parent2856a804c8c2d512bc8a3260501e564c29ee73d6 (diff)
Fix bundledqt module for the bundled-QtScript case
The Qt.script module is not present if the QtScript submodule is used. We must check that in the library collecting code. Change-Id: I7e9aaa5ac3ae546867cd93948653bc42f300429b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/shared')
-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..d10a4e9c5 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 (mod === "script" && !Qt[mod].present)
+ return [];
var fp = Qt[mod].libFilePathRelease;
var fpd = Qt.core.frameworkBuild ? fp + qtDebugLibrarySuffix : Qt[mod].libFilePathDebug;