From 9466b3629a391ae93c4f06d3627e3dc9e10bba9f Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 29 Mar 2021 16:46:19 +0200 Subject: [PATCH] Add missing compile definitions to the resource object library The resource object library must be compiled with the definitions specified in Qt::Core. Missing the required definitions causes linker problems when QT_NAMESPACE is defined. Change-Id: If0ca20604e251822279e0d4906c47b94d3b4ceb4 Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 9e9b0f1e568..b4ffa545789 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1185,6 +1185,9 @@ function(__qt_propagate_generated_resource target resource_name generated_source set(resource_target "${target}_resources_${resource_count}") add_library("${resource_target}" OBJECT "${generated_source_code}") + target_compile_definitions("${resource_target}" PRIVATE + "$" + ) set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resource_name}) # Save the path to the generated source file, relative to the the current build dir.