From c238a249af2ea9f064aca2f36f0e1a8a3fd19f88 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 4 Sep 2019 07:55:34 +0530 Subject: [PATCH] Remove last references to QT_PLUGIN_PATH --- src/calibre/gui2/__init__.py | 2 +- src/calibre/test_build.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 3394c3aee2..ff83ed0242 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1112,7 +1112,7 @@ def sanitize_env_vars(): if islinux and isfrozen: env_vars = {'LD_LIBRARY_PATH':'/lib'} elif iswindows: - env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()} + env_vars = {} elif isosx: env_vars = {k:None for k in ( 'FONTCONFIG_FILE FONTCONFIG_PATH SSL_CERT_FILE').split()} diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py index db92a9b920..a0e49c11ff 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py @@ -194,10 +194,10 @@ class BuildTest(unittest.TestCase): # Ensure that images can be read before QApplication is constructed. # Note that this requires QCoreApplication.libraryPaths() to return the # path to the Qt plugins which it always does in the frozen build, - # because the QT_PLUGIN_PATH env var is set. On non-frozen builds, - # it should just work because the hard-coded paths of the Qt - # installation should work. If they do not, then it is a distro - # problem. + # because Qt is patched to know the layout of the calibre application + # package. On non-frozen builds, it should just work because the + # hard-coded paths of the Qt installation should work. If they do not, + # then it is a distro problem. fmts = set(map(lambda x: x.data().decode('utf-8'), QImageReader.supportedImageFormats())) # no2to3 testf = {'jpg', 'png', 'svg', 'ico', 'gif'} self.assertEqual(testf.intersection(fmts), testf, "Qt doesn't seem to be able to load some of its image plugins. Available plugins: %s" % fmts)