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

only reroute load signals with Qt=5.10

Browse Source 
This stops regressions on Qt<=5.9. It also reintroduces #3110, but
fixing #3110 was just a nice side effect rather than the main goal here.
This commit is contained in:
Ryan Farley 2017-12-21 21:22:20 -06:00
parent d6c56b83a8
commit 4a6c9ecc34
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ import html as html_utils
import sip import sip
from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF, from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
QUrl, QTimer) QUrl, QTimer, QT_VERSION_STR)
from PyQt5.QtGui import QKeyEvent from PyQt5.QtGui import QKeyEvent
from PyQt5.QtNetwork import QAuthenticator from PyQt5.QtNetwork import QAuthenticator
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
@ -830,6 +830,7 @@ class WebEngineTab(browsertab.AbstractTab):
page.windowCloseRequested.connect(self.window_close_requested) page.windowCloseRequested.connect(self.window_close_requested)
page.linkHovered.connect(self.link_hovered) page.linkHovered.connect(self.link_hovered)
page.loadStarted.connect(self._on_load_started)
page.certificate_error.connect(self._on_ssl_errors) page.certificate_error.connect(self._on_ssl_errors)
page.authenticationRequired.connect(self._on_authentication_required) page.authenticationRequired.connect(self._on_authentication_required)
page.proxyAuthenticationRequired.connect( page.proxyAuthenticationRequired.connect(
@ -843,13 +844,20 @@ class WebEngineTab(browsertab.AbstractTab):
self._on_render_process_terminated) self._on_render_process_terminated)
view.iconChanged.connect(self.icon_changed) view.iconChanged.connect(self.icon_changed)
#WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223 #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
if QT_VERSION_STR.startswith('5.10'):
page.loadProgress.connect(self._on_load_progress_fake) page.loadProgress.connect(self._on_load_progress_fake)
self.loadProgressFake.connect(self._on_load_progress) self.loadProgressFake.connect(self._on_load_progress)
page.loadStarted.connect(self._on_load_started)
self.loadFinishedFake.connect(self._on_history_trigger) self.loadFinishedFake.connect(self._on_history_trigger)
self.loadFinishedFake.connect(self._restore_zoom) self.loadFinishedFake.connect(self._restore_zoom)
self.loadFinishedFake.connect(self._on_load_finished) self.loadFinishedFake.connect(self._on_load_finished)
page.loadFinished.connect(self._on_load_finished_fake) page.loadFinished.connect(self._on_load_finished_fake)
else:
#for older Qt versions which break with the above
page.loadProgress.connect(self._on_load_progress)
page.loadStarted.connect(self._on_load_started)
page.loadFinished.connect(self._on_history_trigger)
page.loadFinished.connect(self._restore_zoom)
page.loadFinished.connect(self._on_load_finished)
def event_target(self): def event_target(self):
return self._widget.focusProxy() return self._widget.focusProxy()