diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:00:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:00:35 +0100 |
| commit | 2095b1598ebe1d3ee91f9eeb1f7a13a4cbbf36f9 (patch) | |
| tree | a25c55389f4073408ddd123d7663462078005acb /src/macdeployqt/shared | |
| parent | 24189b5f0935914a979b7e9d3786bec8f9f019bc (diff) | |
| parent | 767f783d65fdd8d154167966b75525c73036e27e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Icff4035509596e277f4612cdfa9363cdaa5371bf
Diffstat (limited to 'src/macdeployqt/shared')
| -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 a6ff37ea0..bba71d9d1 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -647,6 +647,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r QDir().mkpath(destinationPath); LogNormal() << "copy:" << sourcePath << destinationPath; + const bool isDwarfPath = sourcePath.endsWith("DWARF"); QStringList files = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Files | QDir::NoDotAndDotDot); foreach (QString file, files) { @@ -654,7 +655,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r if (file.endsWith("_debug.dylib")) { continue; // Skip debug versions - } else if (file.endsWith(QStringLiteral(".dylib"))) { + } else if (!isDwarfPath && file.endsWith(QStringLiteral(".dylib"))) { // App store code signing rules forbids code binaries in Contents/Resources/, // which poses a problem for deploying mixed .qml/.dylib Qt Quick imports. // Solve this by placing the dylibs in Contents/PlugIns/quick, and then |