From ecda814b91162e561e30a67cf202d8c12d270b7e Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 4 Aug 2023 11:26:32 +0200 Subject: [PATCH] Allow disabling QT_USE_QSTRINGBUILDER definition for module targets Currently QT_USE_QSTRINGBUILDER is added for all Qt module targets by default, and it's not possible to remove this definition. Replace this definition with the generator expression that is propagated by the PlatformModuleInternal target. Change-Id: I1c606e16809dc720e2eb72191e1670dfc48f1b48 Reviewed-by: Alexandru Croitor --- cmake/QtInternalTargets.cmake | 2 +- cmake/QtModuleHelpers.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index 569fddbbc60..6d3eddcb965 100644 --- a/cmake/QtInternalTargets.cmake +++ b/cmake/QtInternalTargets.cmake @@ -160,7 +160,7 @@ qt_internal_add_global_definition(QT_NO_AS_CONST) qt_internal_add_global_definition(QT_NO_QEXCHANGE) qt_internal_add_global_definition(QT_NO_NARROWING_CONVERSIONS_IN_CONNECT) qt_internal_add_global_definition(QT_EXPLICIT_QFILE_CONSTRUCTION_FROM_PATH) -qt_internal_add_global_definition(QT_USE_QSTRINGBUILDER SCOPE PLUGIN TOOL) +qt_internal_add_global_definition(QT_USE_QSTRINGBUILDER SCOPE PLUGIN TOOL MODULE) if(WARNINGS_ARE_ERRORS) qt_internal_set_warnings_are_errors_flags(PlatformModuleInternal INTERFACE) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 0517f096730..792821777e5 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -575,7 +575,6 @@ function(qt_internal_add_module target) list(APPEND defines_for_extend_target QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code - QT_USE_QSTRINGBUILDER QT_DEPRECATED_WARNINGS QT_BUILDING_QT QT_BUILD_${module_define_infix}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore