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>
This commit is contained in:
parent
920bcc0946
commit
b5397e1976
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user