Merge branch 'master' of ssh://cmpl.cc:2323/qutebrowser

This commit is contained in:
Florian Bruhin 2014-06-10 16:17:12 +02:00
commit 57024f3174
2 changed files with 1 additions and 3 deletions

3
BUGS
View File

@ -59,9 +59,6 @@ Bugs
window has a bigger size hint instead of tabs getting smaller than the
minimum size (iggy)
- Directly opening a webm video (e.g.
http://fat.gfycat.com/AlienatedMaleAplomadofalcon.webm ) prints a webkit error.
Upstream Bugs
=============

View File

@ -65,6 +65,7 @@ class BrowserPage(QWebPage):
"""
ignored_errors = [
(QWebPage.QtNetwork, QNetworkReply.OperationCanceledError),
(QWebPage.WebKit, 203), # "Loading is handled by the media engine"
]
info = sip.cast(opt, QWebPage.ErrorPageExtensionOption)
errpage = sip.cast(out, QWebPage.ErrorPageExtensionReturn)