mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

macdeployqt: Hack to make Qt 5.5 work

Browse source
This commit is contained in:
Markus Goetz 2015-11-05 17:19:49 +01:00
parent dae724b21c
commit 0070835330
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/osx/macdeployqt.py
View file

@ -144,6 +144,10 @@ def FindFramework(path):
search_pathes = FRAMEWORK_SEARCH_PATH search_pathes = FRAMEWORK_SEARCH_PATH
search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS')) search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
for search_path in search_pathes: 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) abs_path = os.path.join(search_path, path)
if os.path.exists(abs_path): if os.path.exists(abs_path):
return abs_path return abs_path