diff --git a/bypy/init_env.py b/bypy/init_env.py index ce127019fd..1b78036cfb 100644 --- a/bypy/init_env.py +++ b/bypy/init_env.py @@ -37,6 +37,8 @@ dlls = [ 'Widgets', # 'Multimedia', 'OpenGL', + 'Quick', + 'Qml', # 'MultimediaWidgets', 'Xml', # 'XmlPatterns', diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py index 9c10672b0a..ef5a1a704b 100644 --- a/bypy/linux/__main__.py +++ b/bypy/linux/__main__.py @@ -115,11 +115,14 @@ def copy_libs(env): stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) base = j(QT_PREFIX, 'plugins') - dest = j(env.lib_dir, 'qt_plugins') + dest = j(env.lib_dir, '..', 'plugins') os.mkdir(dest) for x in QT_PLUGINS: if x not in ('audio', 'printsupport'): shutil.copytree(j(base, x), j(dest, x)) + dest = j(env.lib_dir, '..', 'libexec') + os.mkdir(dest) + shutil.copy2(os.path.join(QT_PREFIX, 'libexec', 'QtWebEngineProcess'), dest) def copy_python(env, ext_dir): diff --git a/bypy/linux/launcher.c b/bypy/linux/launcher.c index f25abbcfb6..b1ecdc6fc0 100644 --- a/bypy/linux/launcher.c +++ b/bypy/linux/launcher.c @@ -31,11 +31,7 @@ int main(int argc, char **argv) { /* qt-at-spi causes crashes and performance issues in various distros, so disable it */ SET("QT_ACCESSIBILITY", "0") - memset(buf, 0, PATHLEN); - ldp = getenv("QT_PLUGIN_PATH"); - if (ldp == NULL) snprintf(buf, PATHLEN, "%s/qt_plugins", lib); - else snprintf(buf, PATHLEN, "%s/qt_plugins:%s", lib, ldp); - SET("QT_PLUGIN_PATH", buf); + SET("CALIBRE_QT_PREFIX", base) memset(buf, 0, PATHLEN); ldp = getenv("LD_LIBRARY_PATH"); diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 214ce90f91..c219b17380 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1110,7 +1110,7 @@ def sanitize_env_vars(): is needed to prevent library conflicts when launching external utilities.''' if islinux and isfrozen: - env_vars = {'LD_LIBRARY_PATH':'/lib', 'QT_PLUGIN_PATH':'/lib/qt_plugins'} + env_vars = {'LD_LIBRARY_PATH':'/lib'} elif iswindows: env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()} elif isosx: