From 8684373c08a774a7ed23682a358de991b8775ddd Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 14 Aug 2019 12:05:50 +0200 Subject: Move main configure and move some tests from core to buildtools Processing configuration for gn when building qpdfcore module will require optional libraries resolved. Some libs are not needed, but this requires extra patching of gn build configs; so to keep things simple, just detect all the libs beforehand. Unfortunately using this for main configure goes bonkers. The issue here is that main configure resets features in global scope, which can break features coming from qtbase and results in bogus configurations in certain cases. Therefore move current configuration to buildtools and make everything else depend on this. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6 Reviewed-by: Allan Sandfeld Jensen --- mkspecs/features/functions.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/functions.prf') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index f858243e1..e6c74fc87 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -130,8 +130,8 @@ defineTest(isWebEngineCoreBuild) { return(false) } - include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) - QT_FOR_CONFIG += webenginecore-private + include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) + QT_FOR_CONFIG += buildtools-private win32:!qtConfig(webengine-win-compiler64) { skipBuild("Required 64-bit cross-building or native toolchain could not be found.") -- cgit v1.2.3