summaryrefslogtreecommitdiffstats
path: root/src/macdeployqt/shared/shared.cpp
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-09 10:50:00 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-29 12:46:41 +0200
commit6b2f32f3dc9de965801927a4bc5d970028a318a6 (patch)
treef62db38cfe9aa441b4bcb877ccc8f4bcbeb7974a /src/macdeployqt/shared/shared.cpp
parentf7a50cab668c27ab8e17be96add02e515e9b1681 (diff)
Fix Qt6 build
Change-Id: Ie413ca2e2f81ac0e92628ffd2f3e93047a91bd0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/macdeployqt/shared/shared.cpp')
-rw-r--r--src/macdeployqt/shared/shared.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index a248d8ccd..23a2f9c49 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -1463,11 +1463,12 @@ QSet<QString> codesignBundle(const QString &identity,
continue;
// Check if there are unsigned dependencies, sign these first.
- QStringList dependencies =
- getBinaryDependencies(rootBinariesPath, binary, additionalBinariesContainingRpaths).toSet()
- .subtract(signedBinaries)
- .subtract(pendingBinariesSet)
- .toList();
+ QStringList dependencies = getBinaryDependencies(rootBinariesPath, binary,
+ additionalBinariesContainingRpaths);
+ dependencies = QSet<QString>(dependencies.begin(), dependencies.end())
+ .subtract(signedBinaries)
+ .subtract(pendingBinariesSet)
+ .values();
if (!dependencies.isEmpty()) {
pendingBinaries.push(binary);