From bc657e9cedef4c372e319d2cb4490298d2ffa0b8 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 9 Nov 2018 16:12:35 +0100
Subject: 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>
---
 src/shared/bundledqt/bundledqt.qbs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/shared')

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;
 
-- 
cgit v1.2.3