From 20d89a2710488ca5f9f6674c4c6d167f3a193383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Jul 2024 00:23:08 +0200 Subject: [PATCH] qmake: Don't `_debug`-suffix libraries in single config framework builds 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. Pick-to: 6.8 Change-Id: I6461fca9da5c3ac1382ffc46e63409ef0150ad46 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 9 +++++++-- mkspecs/features/resolve_config.prf | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f1371c8cc6d..5f2251b3e22 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -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) diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf index 816c3b680d5..32107c1192b 100644 --- a/mkspecs/features/resolve_config.prf +++ b/mkspecs/features/resolve_config.prf @@ -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 }