diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py index cb22dc7af4..2b632a9d34 100644 --- a/bypy/macos/__main__.py +++ b/bypy/macos/__main__.py @@ -39,7 +39,6 @@ QT_FRAMEWORKS = [x.replace('5', '') for x in QT_DLLS] ENV = dict( FONTCONFIG_PATH='@executable_path/../Resources/fonts', FONTCONFIG_FILE='@executable_path/../Resources/fonts/fonts.conf', - QT_PLUGIN_PATH='@executable_path/../MacOS/qt-plugins', PYTHONIOENCODING='UTF-8', SSL_CERT_FILE='@executable_path/../Resources/resources/mozilla-ca-certs.pem', ) @@ -317,7 +316,7 @@ class Freeze(object): for f in QT_FRAMEWORKS: self.add_qt_framework(f) pdir = join(QT_PREFIX, 'plugins') - ddir = join(self.contents_dir, 'MacOS', 'qt-plugins') + ddir = join(self.contents_dir, 'PlugIns') os.mkdir(ddir) for x in QT_PLUGINS: shutil.copytree(join(pdir, x), join(ddir, x)) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 5ca021bf3f..3394c3aee2 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1115,7 +1115,7 @@ def sanitize_env_vars(): env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()} elif isosx: 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: env_vars = {}