From de7a39866cf7f7a38b11c02ff448c365858bad96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 8 Jul 2024 16:14:16 +0200 Subject: [PATCH] tst_macdeployqt: Only pass -use-debug-libs for debug-and-release builds When passing -use-debug-libs to macdeployqt it will only consider plugins that end with _debug.dylib, which is not the case for single-configuration framework builds as of d3be87ff1d558f05309b1f29f7e71f291498584f. When not passing -use-debug-libs macdeployqt will use whatever library it finds, both suffixed and not, so the only case where we need to explicitly make it choose one is when we have a debug-and-release build of Qt. Otherwise we can leave macdeployqt to choose the right one. Change-Id: Ic438da9f21c3090f0d57ce615bc0c0969b9a600d Reviewed-by: Timur Pocheptsov (cherry picked from commit 60550f8acc4f9d742f6ef7cb027f0ed3e2d5e42a) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/tools/macdeployqt/tst_macdeployqt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp index d408554319d..4f51467d516 100644 --- a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp +++ b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp @@ -162,7 +162,7 @@ bool deploy(const QString &name, const QStringList &options, QString *errorMessa QString bundle = name + ".app"; QString path = buildPath(name); QStringList args = QStringList() << bundle << options; -#if defined(QT_DEBUG) +#if defined(QT_DEBUG) && QT_CONFIG(debug_and_release) args << "-use-debug-libs"; #endif if (lcTests().isDebugEnabled())