diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 01:00:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 01:00:48 +0200 |
| commit | 3176c821bf5b0a4c1fa0e6c30a706a9f256baa8e (patch) | |
| tree | 92af1a9fcacb72f781b2eb4ff4bc55a96b7a604a /mkspecs | |
| parent | 375f56506089f98118aa1848ed9f05a35e212c90 (diff) | |
| parent | c53f84300111c90b8a63e117fe834a3d52df54c3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9823da32168e99bbece2f8337d0bd4d33e6d634c
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uikit/gc_binaries.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/gc_binaries.prf b/mkspecs/features/uikit/gc_binaries.prf index c4f7445951..aa27e69054 100644 --- a/mkspecs/features/uikit/gc_binaries.prf +++ b/mkspecs/features/uikit/gc_binaries.prf @@ -1,2 +1,6 @@ # bitcode (release mode) is incompatible with splitting sections. -!bitcode|!release: load(gc_binaries) +# We have to explicitly exclude Xcode, as that supports both debug +# and release builds in the same project. Xcode already has a settting +# for dead code stripping which is enabled by default, so we'll still +# strip any libraries build with split sections. +!bitcode|if(!macx-xcode:!release): load(gc_binaries) |