From 00708353307e236db071b1421ffe1f0a1e3457ee Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 5 Nov 2015 17:19:49 +0100 Subject: [PATCH] macdeployqt: Hack to make Qt 5.5 work --- admin/osx/macdeployqt.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py index 3d3fe4908..60ff4b93a 100755 --- a/admin/osx/macdeployqt.py +++ b/admin/osx/macdeployqt.py @@ -144,6 +144,10 @@ def FindFramework(path): search_pathes = FRAMEWORK_SEARCH_PATH search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS')) for search_path in search_pathes: + # The following two lines are needed for a custom built Qt from version 5.5 on, possibly not for the one from the Qt SDK. + # Looks like the upstream macdeployqt also had an issue there https://bugreports.qt.io/browse/QTBUG-47868 + if path.find( "\@rpath/"): + path = path.replace("@rpath/", "") abs_path = os.path.join(search_path, path) if os.path.exists(abs_path): return abs_path