diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-05-04 14:24:23 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-05-05 19:05:09 +0200 |
| commit | b5397e1976bd8d660a719f9504431c95e9984cd5 (patch) | |
| tree | da066d9c1b8b766bb20cfbb42c9396c480fc8f0e /src/tools/macdeployqt/shared/shared.cpp | |
| parent | 920bcc09466513375745d6e2250610d62fb98ff1 (diff) | |
macdeployqt: Consider debug libs when looking for module dependencies
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 <morten.sorvig@qt.io>
Diffstat (limited to 'src/tools/macdeployqt/shared/shared.cpp')
| -rw-r--r-- | src/tools/macdeployqt/shared/shared.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index d4bfb4ce35b..f637416cf22 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; } |