From c7e716ef1ffd63a8ab1f4dbf879230849eb3b505 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 19 May 2022 13:57:16 +0200 Subject: Fix top level build with no widget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that condition module.widgets is not evaluated in time when configured with "-no-widget" to be picked up by the webengine when doing 'top level' build. Use 'widget' feature instead. Fixes: QTBUG-103618 Change-Id: I881e4ba899d376690984c4866336a03d7dae246c Reviewed-by: Jörg Bornemann --- src/pdfwidgets/configure.json | 2 +- src/webenginewidgets/configure.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pdfwidgets/configure.json b/src/pdfwidgets/configure.json index b33f08555..bef08ef72 100644 --- a/src/pdfwidgets/configure.json +++ b/src/pdfwidgets/configure.json @@ -13,7 +13,7 @@ "pdf-widgets": { "label": "Support Qt PDF Widgets", "purpose": "Provides Qt PDF Widgets support.", - "condition": "module.widgets", + "condition": "features.widgets", "output": [ "privateFeature" ] } }, diff --git a/src/webenginewidgets/configure.json b/src/webenginewidgets/configure.json index a27faf78d..8aa41abce 100644 --- a/src/webenginewidgets/configure.json +++ b/src/webenginewidgets/configure.json @@ -13,7 +13,7 @@ "webengine-widgets": { "label": "Support Qt WebEngine Widgets", "purpose": "Provides WebEngine Widgets support.", - "condition": "module.widgets", + "condition": "features.widgets", "output": [ "privateFeature" ] } }, -- cgit v1.2.3