From 86b92b20b79ee8c4106d5b6b27ce164f95fb52f3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 30 Aug 2022 21:35:11 +0200 Subject: [PATCH] macdeployqt: Add back extra `changeInstallName` --- 3rdparty/macdeployqt/shared.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/3rdparty/macdeployqt/shared.cpp b/3rdparty/macdeployqt/shared.cpp index c9a01135..b395a8db 100644 --- a/3rdparty/macdeployqt/shared.cpp +++ b/3rdparty/macdeployqt/shared.cpp @@ -861,7 +861,12 @@ void changeInstallName(const QString &bundlePath, const FrameworkInfo &framework } else { deployedInstallName = framework.deployedInstallName; } - changeInstallName(framework.installName, deployedInstallName, binary); + if (!framework.sourceFilePath.isEmpty()) { + changeInstallName(framework.sourceFilePath, deployedInstallName, binary); + } + if (!framework.installName.isEmpty() && framework.installName != framework.sourceFilePath) { + changeInstallName(framework.installName, deployedInstallName, binary); + } // Workaround for the case when the library ID name is a symlink, while the dependencies // specified using the canonical path to the library (QTBUG-56814) QFileInfo fileInfo= QFileInfo(framework.installName);