diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 19:12:26 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 22:34:12 +0200 |
| commit | a08bf7f00ab64fd3ae7376d8dd50ca8a37bee3e3 (patch) | |
| tree | ab209fc07b14123c8f9f554b3a9f5f790609209b /util/cmake/configurejson2cmake.py | |
| parent | 2158e764dc374239fa346656d5a93ac2ffd7af33 (diff) | |
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 <cristian.adam@qt.io>
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 11bb01a17a..ce032fafaf 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -863,7 +863,9 @@ def get_feature_mapping(): "framework": { "condition": "APPLE AND BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE STREQUAL Debug" }, - "gc_binaries": None, + "gc_binaries": { + "condition" : "NOT QT_FEATURE_shared" + }, "gcc-sysroot": None, "gcov": None, "gnu-libiconv": { |