diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:01:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:01:33 +0200 |
| commit | 6f90e51ac048be83ddbb20addcf88eca9ea68d9f (patch) | |
| tree | 385573221d9b59188eb8f1eef6af0fc191c9f203 /src/macdeployqt/shared | |
| parent | 80a888b303c31725f453dda35f7150b1edf4d674 (diff) | |
| parent | 10263f42de0d2d1fb731deb4213b76fa6c0acd0f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I59f4e4643896a857f30a50fb6d0758576e488e21
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 33d29ecc2..3dff0117e 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 |