From 047d61f188aae3fe3ebc689900b8a5c9fb6e901d Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 9 Aug 2019 17:40:29 +0200 Subject: Add webengine-core feature Create/split main configure for submodules. Now configure system knows when webenginecore module is not going to be built and the user gets the feedback after the configure step with the message: The following modules are not being compiled in this configuration: webenginecore webengine webenginewidgets If a module is not built also features are not populated, therefore some tests have to be moved to main configuration. This improves error reporting and prepares landing for QtPdf modules. Remove configure.prf and fix issues after config split. Add makefile call to report errors. Now calling make also reports issues. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I76944df4c5db6f4954c464e3741a8054cb10b40e Reviewed-by: Allan Sandfeld Jensen --- configure.pri | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'configure.pri') diff --git a/configure.pri b/configure.pri index 23f72c5c6..a90b06687 100644 --- a/configure.pri +++ b/configure.pri @@ -120,7 +120,7 @@ defineTest(qtConfTest_detectGn) { return(false) } -defineTest(qtConfTest_embedded) { +defineTest(qtConfTest_detectEmbedded) { lessThan(QT_MINOR_VERSION, 9) { cross_compile: return(true) return(false) @@ -129,6 +129,20 @@ defineTest(qtConfTest_embedded) { return(false) } +defineTest(qtConfTest_detectXcb) { + #workaround for for not working 'depends' in main configure when no 'module' + QT_FOR_CONFIG += gui-private + qtConfig(xcb): return(true) + return(false) +} + +defineTest(qtConfTest_detectDeveloperBuild) { + #workaround for for not working 'depends' in main configure when no 'module' + QT_FOR_CONFIG += core-private + qtConfig(private_tests): return(true) # enabled for developer-build + return(false) +} + defineTest(qtConfTest_detectHostPkgConfig) { PKG_CONFIG = $$qtConfPkgConfig(true) isEmpty(PKG_CONFIG) { -- cgit v1.2.3