From 540451ab9a7e8e9f85078b4cebcc7f619a8b6322 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 18 Mar 2020 17:41:27 +0100 Subject: Fix for macOS packaging problem Running build in parallel for debug and release on mac os was resulting in corrupted resource, due to possible simultaneous QMAKE_BUNDLE_DATA resources write from release and debug builds. Add missing qtConfig checks. Fixes: QTBUG-76549 Change-Id: Icc0dee7b06d442e9c15d7afa53c0372e8d82b4a2 Reviewed-by: Michal Klocek --- src/core/core_module.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/core_module.pro') diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 4b9268e1a..d7e2ab8da 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -107,7 +107,7 @@ resources.files = $$REPACK_DIR/qtwebengine_resources.pak \ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat -!debug_and_release|!build_all|CONFIG(release, debug|release) { +!qtConfig(debug_and_release)|!qtConfig(build_all)|CONFIG(release, debug|release) { qtConfig(framework) { locales.version = Versions locales.path = Resources/qtwebengine_locales @@ -146,7 +146,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat } } -!build_pass:debug_and_release { +!build_pass:qtConfig(debug_and_release) { # Special GNU make target that ensures linking isn't done for both debug and release builds # at the same time. notParallel.target = .NOTPARALLEL -- cgit v1.2.3