diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-08-26 17:03:46 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-08-26 17:03:46 +0200 |
commit | 03736ff0ddebdd94841d170ce5d31327bec21f3d (patch) | |
tree | ef0fee44a50649883255e33f123cf5594b338a87 /qutebrowser | |
parent | c716c5ce40f987dd21e8d114d6a40813cb584d5b (diff) | |
download | qutebrowser-03736ff0ddebdd94841d170ce5d31327bec21f3d.tar.gz qutebrowser-03736ff0ddebdd94841d170ce5d31327bec21f3d.zip |
More random API changes
Diffstat (limited to 'qutebrowser')
-rw-r--r-- | qutebrowser/app.py | 2 | ||||
-rw-r--r-- | qutebrowser/browser/webengine/webenginequtescheme.py | 6 | ||||
-rw-r--r-- | qutebrowser/browser/webkit/network/networkmanager.py | 1 | ||||
-rw-r--r-- | qutebrowser/misc/elf.py | 2 | ||||
-rw-r--r-- | qutebrowser/misc/sql.py | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 37a1309cf..c7eefb37b 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -564,7 +564,7 @@ class Application(QApplication): self.launch_time = datetime.datetime.now() self.focusObjectChanged.connect( # type: ignore[attr-defined] self.on_focus_object_changed) - self.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True) + #self.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True) self.new_window.connect(self._on_new_window) diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py index 915890968..6c887dc95 100644 --- a/qutebrowser/browser/webengine/webenginequtescheme.py +++ b/qutebrowser/browser/webengine/webenginequtescheme.py @@ -137,7 +137,7 @@ def init(): if QWebEngineUrlScheme is not None: assert not QWebEngineUrlScheme.schemeByName(b'qute').name() scheme = QWebEngineUrlScheme(b'qute') - scheme.setFlags( - QWebEngineUrlScheme.Flag.LocalScheme | # type: ignore[arg-type] - QWebEngineUrlScheme.Flag.LocalAccessAllowed) + #scheme.setFlags( + # QWebEngineUrlScheme.Flag.LocalScheme | # type: ignore[arg-type] + # QWebEngineUrlScheme.Flag.LocalAccessAllowed) QWebEngineUrlScheme.registerScheme(scheme) diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index b8e87350b..4449ba90e 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -103,6 +103,7 @@ def _is_secure_cipher(cipher): def init(): """Disable insecure SSL ciphers on old Qt versions.""" + return default_ciphers = QSslSocket.defaultCiphers() log.init.vdebug( # type: ignore[attr-defined] "Default Qt ciphers: {}".format( diff --git a/qutebrowser/misc/elf.py b/qutebrowser/misc/elf.py index e1c4ace29..03e8ca0d6 100644 --- a/qutebrowser/misc/elf.py +++ b/qutebrowser/misc/elf.py @@ -314,7 +314,7 @@ def parse_webenginecore() -> Optional[Versions]: # Flatpak has Qt in /usr/lib/x86_64-linux-gnu, but QtWebEngine in /app/lib. library_path = pathlib.Path("/app/lib") else: - library_path = pathlib.Path(QLibraryInfo.location(QLibraryInfo.LibraryLocation.LibrariesPath)) + library_path = pathlib.Path(QLibraryInfo.path(QLibraryInfo.LibraryPath.LibrariesPath)) library_name = sorted(library_path.glob('libQt5WebEngineCore.so*')) if not library_name: diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index 8d732774e..ea3c93703 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -324,7 +324,7 @@ class Query: self.query.bindValue(f':{key}', val) bound_values = self.bound_values() - if None in bound_values.values(): + if None in bound_values: raise BugError("Missing bound values!") return bound_values |