Skip to content

Commit 2aef845

Browse files
torarnvjaheikk
authored andcommitted
macOS: Don't link to debug versions of frameworks unless requested
The failure mode of this behavior is worse than the surprises that the non-explicit library dependency chain has, so it should be opt-in. This reverts back to the behavior in Qt 5.11, but lets our tests opt in to the feature. Fixes: QTBUG-71724 Change-Id: Iede11f02d978b637324ddf71d29e7c99fe3ee99f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
1 parent 8e8c11f commit 2aef845

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

mkspecs/features/qt.prf

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ for(ever) {
231231
!isEmpty(MODULE_MODULE) {
232232
contains(MODULE_CONFIG, lib_bundle) {
233233
framework = $$MODULE_MODULE
234-
qtConfig(debug_and_release):!macx-xcode {
234+
qtConfig(debug_and_release):qt_link_suffixed_framework:!macx-xcode {
235235
platform_target_suffix = $$qtPlatformTargetSuffix()
236236
!isEmpty(platform_target_suffix): \
237237
# The -framework linker argument supports a name[,suffix] version,

mkspecs/features/testcase.prf

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ testcase_lowdpi {
2121
}
2222
}
2323

24+
# Make sure we explicitly link to the debug version of the Qt libraries if needed
25+
macos: CONFIG += qt_link_suffixed_framework
26+
2427
benchmark: type = benchmark
2528
else: type = check
2629

0 commit comments

Comments
 (0)