Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of QT_PLUGIN_PATH on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2019-09-01 12:28:55 +05:30
parent e00835e5c6
commit 58f5577a13
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bypy/macos/__main__.py
View File

@ -39,7 +39,6 @@ QT_FRAMEWORKS = [x.replace('5', '') for x in QT_DLLS]
ENV = dict( ENV = dict(
FONTCONFIG_PATH='@executable_path/../Resources/fonts', FONTCONFIG_PATH='@executable_path/../Resources/fonts',
FONTCONFIG_FILE='@executable_path/../Resources/fonts/fonts.conf', FONTCONFIG_FILE='@executable_path/../Resources/fonts/fonts.conf',
QT_PLUGIN_PATH='@executable_path/../MacOS/qt-plugins',
PYTHONIOENCODING='UTF-8', PYTHONIOENCODING='UTF-8',
SSL_CERT_FILE='@executable_path/../Resources/resources/mozilla-ca-certs.pem', SSL_CERT_FILE='@executable_path/../Resources/resources/mozilla-ca-certs.pem',
) )
@ -317,7 +316,7 @@ class Freeze(object):
for f in QT_FRAMEWORKS: for f in QT_FRAMEWORKS:
self.add_qt_framework(f) self.add_qt_framework(f)
pdir = join(QT_PREFIX, 'plugins') pdir = join(QT_PREFIX, 'plugins')
ddir = join(self.contents_dir, 'MacOS', 'qt-plugins') ddir = join(self.contents_dir, 'PlugIns')
os.mkdir(ddir) os.mkdir(ddir)
for x in QT_PLUGINS: for x in QT_PLUGINS:
shutil.copytree(join(pdir, x), join(ddir, x)) shutil.copytree(join(pdir, x), join(ddir, x))

2
src/calibre/gui2/__init__.py
View File

@ -1115,7 +1115,7 @@ def sanitize_env_vars():
env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()} env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()}
elif isosx: elif isosx:
env_vars = {k:None for k in ( env_vars = {k:None for k in (
'FONTCONFIG_FILE FONTCONFIG_PATH QT_PLUGIN_PATH SSL_CERT_FILE').split()} 'FONTCONFIG_FILE FONTCONFIG_PATH SSL_CERT_FILE').split()}
else: else:
env_vars = {} env_vars = {}