From 59d1a6f2c666538a4351bc8b2ebda4f24060f88c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 30 Jan 2016 15:56:27 +0530 Subject: [PATCH] Update version of Qt in OS X build to 5.5.1 Needed to prevent QT from using the system openssl library. For Qt >= 5.5 it uses Apple's TextScure API instead of openssl. --- setup/build_environment.py | 1 + setup/installer/osx/app/main.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/setup/build_environment.py b/setup/build_environment.py index c3b77c45e3..f53b06be59 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -182,6 +182,7 @@ if iswindows: podofo_inc = os.path.join(sw_inc_dir, 'podofo') podofo_lib = sw_lib_dir elif isosx: + QT_DLLS += ['Qt5DBus'] QT_FRAMEWORKS = [x.replace('5', '') for x in QT_DLLS] sw = os.environ.get('SW', os.path.expanduser('~/sw')) podofo_inc = os.path.join(sw, 'include', 'podofo') diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py index 5b00c38326..7c79636c9b 100644 --- a/setup/installer/osx/app/main.py +++ b/setup/installer/osx/app/main.py @@ -262,12 +262,15 @@ class Py2App(object): @flush def get_local_dependencies(self, path_to_lib): for x, is_id in self.get_dependencies(path_to_lib): - for y in (SW+'/lib/', SW+'/qt/lib/', SW+'/python/Python.framework/', SW+'/private/ssl/lib/'): - if x.startswith(y): - if y == SW+'/python/Python.framework/': - y = SW+'/python/' - yield x, x[len(y):], is_id - break + if x.startswith('@rpath/Qt'): + yield x, x[len('@rpath/'):], is_id + else: + for y in (SW+'/lib/', SW+'/python/Python.framework/', SW+'/private/ssl/lib/'): + if x.startswith(y): + if y == SW+'/python/Python.framework/': + y = SW+'/python/' + yield x, x[len(y):], is_id + break @flush def change_dep(self, old_dep, new_dep, is_id, path_to_lib):