diff options
Diffstat (limited to 'qutebrowser/browser/webengine/webenginetab.py')
-rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 37750e343..ef4126047 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -40,7 +40,7 @@ from qutebrowser.browser.webengine import (webview, webengineelem, tabhistory, from qutebrowser.utils import (usertypes, qtutils, log, javascript, utils, resources, message, jinja, debug, version) -from qutebrowser.qt import sip +from qutebrowser.qt import sip, machinery from qutebrowser.misc import objects, miscwidgets @@ -85,12 +85,8 @@ class WebEnginePrinting(browsertab.AbstractPrinting): """Called from WebEngineTab.connect_signals.""" page = self._widget.page() page.pdfPrintingFinished.connect(self.pdf_printing_finished) - try: - # Qt 6 + if machinery.IS_QT6: self._widget.printFinished.connect(self.printing_finished) - except AttributeError: - # Qt 5: Uses callbacks instead - pass def check_pdf_support(self): pass @@ -103,10 +99,9 @@ class WebEnginePrinting(browsertab.AbstractPrinting): self._widget.page().printToPdf(filename) def to_printer(self, printer): - try: - # Qt 5 + if machinery.IS_QT5: self._widget.page().print(printer, self.printing_finished.emit) - except AttributeError: + else: # Qt 6 self._widget.print(printer) @@ -1068,8 +1063,7 @@ class _WebEngineScripts(QObject): def _remove_js(self, name): """Remove an early QWebEngineScript.""" scripts = self._widget.page().scripts() - if hasattr(scripts, 'find'): - # Qt 6 + if machinery.IS_QT6: for script in scripts.find(f'_qute_{name}'): scripts.remove(script) else: @@ -1702,6 +1696,7 @@ class WebEngineTab(browsertab.AbstractTab): # pylint: disable=protected-access self.audio._connect_signals() self.search.connect_signals() + assert isinstance(self.printing, WebEnginePrinting) self.printing.connect_signals() self._permissions.connect_signals() self._scripts.connect_signals() |