1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: Don't _debug-suffix libraries in single config framework builds

Browse Source 
On Apple platforms we no longer _debug suffix libraries (and plugins)
in single config framework builds. This is a follow-up for logic in
qmake that didn't get adjusted in d3be87ff1d558f05309b1f29f7e71f291498584f.

Change-Id: I6461fca9da5c3ac1382ffc46e63409ef0150ad46
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 20d89a2710488ca5f9f6674c4c6d167f3a193383)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-07-03 00:23:08 +02:00 committed by Qt Cherry-pick Bot
parent 705dbea2a9
commit 79370e0b4c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/features/qt_functions.prf
View File

@ -19,8 +19,13 @@ defineReplace(qtPlatformTargetSuffix) {
}
darwin {
contains($$config_variable, debug, debug|release) {
!debug_and_release|build_pass: \
return($${suffix}_debug)
debug_and_release {
build_pass: \
return($${suffix}_debug)
} else {
!qtConfig(framework): \
return($${suffix}_debug)
}
}
}
return($$suffix)

2
mkspecs/features/resolve_config.prf
View File

@ -45,7 +45,7 @@ CONFIG(debug, debug|release) {
equals(build, debug): \
suffix = _debug
} else {
contains(QT_CONFIG, debug): \
!qtConfig(framework):contains(QT_CONFIG, debug): \
suffix = _debug
}