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 --- configure.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index fa20b94333..3863f34285 100644 --- a/configure.cmake +++ b/configure.cmake @@ -355,6 +355,9 @@ qt_feature("cross_compile" PUBLIC ) qt_feature_config("cross_compile" QMAKE_PUBLIC_CONFIG) qt_feature_config("cross_compile" QMAKE_PRIVATE_CONFIG) +qt_feature("gc_binaries" PRIVATE + CONDITION NOT QT_FEATURE_shared +) qt_feature("use_bfd_linker" LABEL "bfd" AUTODETECT false -- cgit v1.2.3