From b5397e1976bd8d660a719f9504431c95e9984cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 4 May 2023 14:24:23 +0200 Subject: [PATCH] macdeployqt: Consider debug libs when looking for module dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we will fail to add plugins such as the SQL plugins, because we think that the Sql module is not in the list of module dependencies. Pick-to: 6.5 Change-Id: Ie03d2506e8d86904f51b4198641ad61a6977e592 Reviewed-by: Morten Johan Sørvig --- src/tools/macdeployqt/shared/shared.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index d4bfb4ce35..f637416cf2 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp @@ -937,7 +937,10 @@ bool DeploymentInfo::containsModule(const QString &module, const QString &libInF if (deployedFrameworks.contains("Qt"_L1 + module + libInFix + ".framework"_L1)) return true; // Check for dylib - const QRegularExpression dylibRegExp("libQt[0-9]+"_L1 + module + libInFix + ".[0-9]+.dylib"_L1); + const QRegularExpression dylibRegExp("libQt[0-9]+"_L1 + + module + libInFix + + (isDebug ? "_debug" : "") + + ".[0-9]+.dylib"_L1); return deployedFrameworks.filter(dylibRegExp).size() > 0; }