diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-08-25 12:25:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-27 08:42:26 +0000 |
| commit | ee9a4dbe7c1103700a641d6d9a733b3fcbae980d (patch) | |
| tree | aa35791caaf7dabaa7c5e9e24965649095be1b07 | |
| parent | 2f24335202d9e2aa0b4cc0929aaf5443f97163f2 (diff) | |
macdeployqt: deploy plugins also when QtCore5Compat exists
macdeployqt determines Qt's libinfix by examining the
naming of QtCore.framework, looking for the infix between
"QtCore" and ".framework".
This worked well until we added QtCore5Compat.framework.
Add check to make sure we don't pick "5Compat" as the
infix.
Fixes: QTBUG-94796
Change-Id: I79b355c19e3826fe1e2a3677e8ec26e1abada11f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 40b329a4b312add7951ddb826ad28eb43c576042)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 8d163c5b1..638f83f31 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1055,7 +1055,8 @@ QString getLibInfix(const QStringList &deployedFrameworks) { QString libInfix; foreach (const QString &framework, deployedFrameworks) { - if (framework.startsWith(QStringLiteral("QtCore")) && framework.endsWith(QStringLiteral(".framework"))) { + if (framework.startsWith(QStringLiteral("QtCore")) && framework.endsWith(QStringLiteral(".framework")) && + !framework.contains(QStringLiteral("5Compat"))) { Q_ASSERT(framework.length() >= 16); // 16 == "QtCore" + ".framework" const int lengthOfLibInfix = framework.length() - 16; |