diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index b708de742..1fc848a1e 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -47,6 +47,7 @@ Changed DATADIR and MANDIR. - Various performance improvements when many tabs are opened. - Regenerating completion history now shows a progress dialog. +- Make qute:// pages work properly on Qt 5.11.2 Removed ~~~~~~~ diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py index b94fc3844..202482084 100644 --- a/qutebrowser/browser/webengine/webenginequtescheme.py +++ b/qutebrowser/browser/webengine/webenginequtescheme.py @@ -19,7 +19,7 @@ """QtWebEngine specific qute://* handlers and glue code.""" -from PyQt5.QtCore import QBuffer, QIODevice +from PyQt5.QtCore import QBuffer, QIODevice, QUrl from PyQt5.QtWebEngineCore import (QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob) @@ -57,6 +57,10 @@ class QuteSchemeHandler(QWebEngineUrlSchemeHandler): # Added in Qt 5.11 return True + if initiator == QUrl('null') and not qtutils.version_check('5.12'): + # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-70421 + return True + if initiator.isValid() and initiator.scheme() != 'qute': log.misc.warning("Blocking malicious request from {} to {}" .format(initiator.toDisplayString(),