diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-10-15 14:09:26 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-10-23 15:26:24 +0000 |
| commit | d07e6b891e69c9ce4bed9e91c917d81d0d8a6ae1 (patch) | |
| tree | 79ecb4253224026f121c7ac28f773c2ab59a565e | |
| parent | 523b72743a40df3445e0ab7af421b60b5f76bc55 (diff) | |
| download | qttools-d07e6b891e69c9ce4bed9e91c917d81d0d8a6ae1.tar.gz | |
macOS: Don't overwrite the dylibs with the DWARF copy
Task-number: QTBUG-57265
Change-Id: I54320275aa614e76b65fdc82bb87a2850648bbdc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -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 e4ec8c9a1..94efdb8fc 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -644,6 +644,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) { @@ -651,7 +652,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 |