summaryrefslogtreecommitdiff
path: root/qutebrowser/mainwindow/tabbedbrowser.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-11-03 14:21:42 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-11-04 18:30:04 +0100
commit27b1efae890e592da6bae155f33086a560d5a818 (patch)
treef4330d08a6bad3bc1420c45904b2cb0d6cb8032d /qutebrowser/mainwindow/tabbedbrowser.py
parentd8f6bcbf5e462b6def49ae655c902aeb9786efbb (diff)
downloadqutebrowser-27b1efae890e592da6bae155f33086a560d5a818.tar.gz
qutebrowser-27b1efae890e592da6bae155f33086a560d5a818.zip
old qt: Drop error page workaround
Diffstat (limited to 'qutebrowser/mainwindow/tabbedbrowser.py')
-rw-r--r--qutebrowser/mainwindow/tabbedbrowser.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 4dc08172d..36ac56a52 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -940,18 +940,11 @@ class TabbedBrowser(QWidget):
tab.set_html(html)
log.webview.error(msg)
- if qtutils.version_check('5.9', compiled=False):
- url_string = tab.url(requested=True).toDisplayString()
- error_page = jinja.render(
- 'error.html', title="Error loading {}".format(url_string),
- url=url_string, error=msg)
- QTimer.singleShot(100, lambda: show_error_page(error_page))
- else:
- # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698
- message.error(msg)
- self._remove_tab(tab, crashed=True)
- if self.widget.count() == 0:
- self.tabopen(QUrl('about:blank'))
+ url_string = tab.url(requested=True).toDisplayString()
+ error_page = jinja.render(
+ 'error.html', title="Error loading {}".format(url_string),
+ url=url_string, error=msg)
+ QTimer.singleShot(100, lambda: show_error_page(error_page))
def resizeEvent(self, e):
"""Extend resizeEvent of QWidget to emit a resized signal afterwards.