aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-11-12 15:41:44 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-11-12 15:41:44 +0100
commit83a9ed222f892666aab741f9afa95931bf097278 (patch)
treee13db972d4d1bcc866ad1bc4e78c0e1b28eb5b34 /src/shared
parentd1e04aae05e4ea17a6461cf323c9c15ede176b5b (diff)
parentbc657e9cedef4c372e319d2cb4490298d2ffa0b8 (diff)
Merge 1.12 into master
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 f36855b02..6e9b744ab 100644
--- a/src/shared/bundledqt/bundledqt.qbs
+++ b/src/shared/bundledqt/bundledqt.qbs
@@ -35,6 +35,8 @@ Product {
[], Object.getOwnPropertyNames(Qt).map(function(mod) {
if (mod === "script" && !Qt[mod].present)
return [];
+ if (!Qt[mod].hasLibrary)
+ return [];
var fp = Qt[mod].libFilePathRelease;
var fpd = Qt.core.frameworkBuild ? fp + qtDebugLibrarySuffix : Qt[mod].libFilePathDebug;