From 3f332d3871e5e39f244f63cdba4e8f4d1b530080 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 5 Feb 2017 19:08:44 +0100 Subject: [PATCH] Remove @pyqtSlot annotation which breaks with LibreSSL Fixes #2213 --- CHANGELOG.asciidoc | 1 + qutebrowser/browser/webkit/network/networkmanager.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 5e12bdcc3..c3aea65e7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -49,6 +49,7 @@ Fixed (TTF)" as font name. - Crash reports are now re-enabled when using QtWebEngine - Fixed crashes when closing tabs while hinting +- Fixed starting on newer PyQt/sip versions with LibreSSL v0.9.1 ------ diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index caa04636d..779d778bc 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -211,7 +211,8 @@ class NetworkManager(QNetworkAccessManager): request.deleteLater() self.shutting_down.emit() - @pyqtSlot('QNetworkReply*', 'QList') + # No @pyqtSlot here, see + # https://github.com/qutebrowser/qutebrowser/issues/2213 def on_ssl_errors(self, reply, errors): # pragma: no mccabe """Decide if SSL errors should be ignored or not.