From 3399f2df9698a3c7bb7b9da3cfa34467f01efcb7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 17 Jun 2018 21:03:44 +0200 Subject: [PATCH] Always clear searches between page loads Looks like this wasn't properly fixed in Qt for some reason. Fixes #3693 See #2728 and bef372e5f5dd811eacd959de28f17355407cb7e2 --- doc/changelog.asciidoc | 1 + qutebrowser/browser/webengine/webenginetab.py | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index c919eac5c..f1eee3983 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -97,6 +97,7 @@ Fixed ~~~~~ - Various subtle keyboard focus issues. +- Workaround for a Qt bug which preserves searches between page loads. Removed ~~~~~~~ diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 86f5e08c8..6739c2f66 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1137,11 +1137,10 @@ class WebEngineTab(browsertab.AbstractTab): @pyqtSlot() def _on_load_started(self): """Clear search when a new load is started if needed.""" - if (qtutils.version_check('5.9', compiled=False) and - not qtutils.version_check('5.9.2', compiled=False)): - # WORKAROUND for - # https://bugreports.qt.io/browse/QTBUG-61506 - self.search.clear() + # WORKAROUND for + # https://bugreports.qt.io/browse/QTBUG-61506 + # (seems to be back in later Qt versions as well) + self.search.clear() super()._on_load_started() self.data.netrc_used = False