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

We need to set QtQuick api as well when running on non OpenGL platforms

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-10 22:07:44 +05:30
parent 8be484c108
commit e8447b65ab
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import calibre.gui2.pyqt6_compat as pqc
from calibre import as_unicode, prints from calibre import as_unicode, prints
from calibre.constants import ( from calibre.constants import (
DEBUG, __appname__ as APP_UID, __version__, config_dir, is_running_from_develop, DEBUG, __appname__ as APP_UID, __version__, config_dir, is_running_from_develop,
isbsd, isfrozen, islinux, ismacos, iswindows, isxp, plugins_loc isbsd, isfrozen, islinux, ismacos, iswindows, isxp, numeric_version, plugins_loc
) )
from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata import MetaInformation
from calibre.gui2.linux_file_dialogs import ( from calibre.gui2.linux_file_dialogs import (
@ -1064,6 +1064,21 @@ def setup_unix_signals(self):
return original_handlers return original_handlers
def setup_to_run_webengine():
# Allow import of webengine after construction of QApplication on new enough PyQt
QApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts)
try:
# this import is needed to have Qt call qt_registerDefaultPlatformBackingStoreOpenGLSupport
from qt.core import QOpenGLWidget
del QOpenGLWidget
from PyQt6.QtQuick import QQuickWindow, QSGRendererInterface
QQuickWindow.setGraphicsApi(QSGRendererInterface.GraphicsApi.OpenGL)
except ImportError:
# for people running from source
if numeric_version >= (6, 3):
raise
class Application(QApplication): class Application(QApplication):
shutdown_signal_received = pyqtSignal() shutdown_signal_received = pyqtSignal()
@ -1074,16 +1089,7 @@ class Application(QApplication):
args = sys.argv[:1] args = sys.argv[:1]
args = [args[0]] args = [args[0]]
QNetworkProxyFactory.setUseSystemConfiguration(True) QNetworkProxyFactory.setUseSystemConfiguration(True)
# Allow import of webengine after construction of QApplication on new setup_to_run_webengine()
# enough PyQt
QApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts)
# this import is needed to have Qt call qt_registerDefaultPlatformBackingStoreOpenGLSupport
try:
from qt.core import QOpenGLWidget
del QOpenGLWidget
except ImportError:
if not is_running_from_develop:
raise
if iswindows: if iswindows:
self.windows_app_uid = None self.windows_app_uid = None
if windows_app_uid: if windows_app_uid: