rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid hacks for changing per-domain settings on Qt 5.11.1

Browse Source
This commit is contained in:
Florian Bruhin 2018-06-07 17:51:21 +02:00
parent b1506274c5
commit d541634a7c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qutebrowser/browser/webengine/webenginetab.py
View File

@ -1049,9 +1049,13 @@ class WebEngineTab(browsertab.AbstractTab):
@pyqtSlot(QUrl) @pyqtSlot(QUrl)
def _on_predicted_navigation(self, url): def _on_predicted_navigation(self, url):
"""If we know we're going to visit an URL soon, change the settings.""" """If we know we're going to visit an URL soon, change the settings.
This is a WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
"""
super()._on_predicted_navigation(url) super()._on_predicted_navigation(url)
self.settings.update_for_url(url) if not qtutils.version_check('5.11.1', compiled=False):
self.settings.update_for_url(url)
@pyqtSlot(usertypes.NavigationRequest) @pyqtSlot(usertypes.NavigationRequest)
def _on_navigation_request(self, navigation): def _on_navigation_request(self, navigation):
@ -1074,14 +1078,16 @@ class WebEngineTab(browsertab.AbstractTab):
# On Qt < 5.11, we don't don't need a reload when type == link_clicked. # On Qt < 5.11, we don't don't need a reload when type == link_clicked.
# On Qt 5.11.0, we always need a reload. # On Qt 5.11.0, we always need a reload.
# TODO on Qt > 5.11.0, we hopefully never need a reload: # On Qt > 5.11.0, we never need a reload:
# https://codereview.qt-project.org/#/c/229525/1 # https://codereview.qt-project.org/#/c/229525/1
if not qtutils.version_check('5.11.0', exact=True, compiled=False): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
if qtutils.version_check('5.11.1', compiled=False):
reload_needed = False
elif not qtutils.version_check('5.11.0', exact=True, compiled=False):
if navigation.navigation_type != navigation.Type.link_clicked: if navigation.navigation_type != navigation.Type.link_clicked:
reload_needed = False reload_needed = False
if reload_needed: if reload_needed:
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
self._reload_url = navigation.url self._reload_url = navigation.url
def _connect_signals(self): def _connect_signals(self):