From a08bf7f00ab64fd3ae7376d8dd50ca8a37bee3e3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 12 Jun 2020 19:12:26 +0200 Subject: CMake: Fix usage of gc_binaries feature The qt_internal_apply_gc_binaries function should apply both compile and link flags, not just link flags. The flags should be applied publically to all consumers of Bootstrap regardless if the gc_binaries feature is enabled. The flags should be applied publically to Core only in case if the feature is enabled (aka for static builds only). Change-Id: Id42af0d9b527004d74c04eff2c9e3c2be1e76aac Fixes: QTBUG-84461 Task-number: QTBUG-83929 Reviewed-by: Cristian Adam --- qmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index c12cb03237..efc6c81da4 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -270,7 +270,7 @@ set_target_properties(${target_name} PROPERTIES AUTOUIC OFF ) -qt_internal_add_link_flags_gc_sections(${target_name} PRIVATE) # special case +qt_internal_apply_gc_binaries(${target_name} PRIVATE) # special case qt_enable_msvc_cplusplus_define(${target_name} PUBLIC) # special case qt_skip_warnings_are_errors(${target_name}) # special case -- cgit v1.2.3