From 335d91e6d6c4ac21bcf39c4f5bb9a8bcd0e597bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 20 Mar 2017 13:36:22 +0100 Subject: macdeployqt: Fix code signing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were attempting to code sign bundle data files, which the logic in codesignBundle() is not designed to handle. This caused errors when trying to run otool on on .plist files etc. Remove the “catch all” code path that was added in commit 7d2b0968 and restrict codesignBundle() to work on executables. Task-number: QTBUG-54380 Change-Id: I9192d2876a0031a2feb19053c404196962ac22d4 Reviewed-by: Alexandru Croitor --- src/macdeployqt/shared/shared.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index da69b1e38..edf5f7d5f 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1380,13 +1380,6 @@ QSet codesignBundle(const QString &identity, QStringList frameworkPaths = findAppFrameworkPaths(appBundlePath); foreach (const QString &frameworkPath, frameworkPaths) { - // Add all files for a framework as a catch all. - QStringList bundleFiles = findAppBundleFiles(frameworkPath, getAbsoltuePath); - foreach (const QString &binary, bundleFiles) { - pendingBinaries.push(binary); - pendingBinariesSet.insert(binary); - } - // Prioritise first to sign any additional inner bundles found in the Helpers folder (e.g // used by QtWebEngine). QDirIterator helpersIterator(frameworkPath, QStringList() << QString::fromLatin1("Helpers"), QDir::Dirs | QDir::NoSymLinks, QDirIterator::Subdirectories); @@ -1406,7 +1399,7 @@ QSet codesignBundle(const QString &identity, while (librariesIterator.hasNext()) { librariesIterator.next(); QString librariesPath = librariesIterator.filePath(); - bundleFiles = findAppBundleFiles(librariesPath, getAbsoltuePath); + QStringList bundleFiles = findAppBundleFiles(librariesPath, getAbsoltuePath); foreach (const QString &binary, bundleFiles) { pendingBinaries.push(binary); pendingBinariesSet.insert(binary); -- cgit v1.2.1