diff options
| author | Florian Bruhin <git@the-compiler.org> | 2018-06-07 13:31:34 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2018-06-07 14:36:10 +0200 |
| commit | 22644c41da6ed1bc1a9692e30bc4b20d7e0e3200 (patch) | |
| tree | 2749836db1bf45ddd488dcdef3e65fb00c675f0d | |
| parent | 6b5857ef7d2911e6ce05fe9e4c9f1ef4336be653 (diff) | |
| download | qutebrowser-22644c41da6ed1bc1a9692e30bc4b20d7e0e3200.tar.gz qutebrowser-22644c41da6ed1bc1a9692e30bc4b20d7e0e3200.zip | |
Add a workaround for chrome-error:// loops on Qt 5.11
See #3661
(cherry picked from commit 0c0d204fd41230291739e09f8e03f6781c4fa67f)
| -rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 6 | ||||
| -rw-r--r-- | qutebrowser/html/error.html | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 87fbb1fc7..5cc87091a 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1021,6 +1021,12 @@ class WebEngineTab(browsertab.AbstractTab): if not ok and not js_enabled: self.dump_async(self._error_page_workaround) + if (not ok and + self.url() == QUrl('chrome-error://chromewebdata/') and + qtutils.version_check('5.11', compiled=False)): + # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-63378 + self._show_error_page(QUrl(), "Unknown URL scheme") + if ok and self._reload_url is not None: # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656 log.config.debug( diff --git a/qutebrowser/html/error.html b/qutebrowser/html/error.html index 615e4ba8b..b3e6f576e 100644 --- a/qutebrowser/html/error.html +++ b/qutebrowser/html/error.html @@ -74,7 +74,7 @@ function tryagain() </td> <td style="padding-left: 40px;"> <h1>Unable to load page</h1> - Error while opening {{ url }}<br> + Error while opening {{ url | default('page', true) }}<br> <p id="error-message-text" style="color: #a31a1a;">{{ error }}</p><br><br> <form name="bl"> |