From cde36f34b0aa33a8af3000bff2c7fdb125467765 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 10 May 2017 07:07:06 +0200 Subject: [PATCH] Remove QtWebKit-NG warnings The next release will support private browsing, and we can't easily check the version somehow. --- qutebrowser/browser/commands.py | 5 ----- qutebrowser/browser/webkit/webkitsettings.py | 20 ++++++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 99954ac78..15f03b439 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -256,11 +256,6 @@ class CommandDispatcher: urls = self._parse_url_input(url) if private: - # WORKAROUND for https://github.com/annulen/webkit/issues/54 - if (objects.backend == usertypes.Backend.QtWebKit and - qtutils.is_qtwebkit_ng()): - message.warning("Private browsing is not fully " - "implemented by QtWebKit-NG!") window = True for i, cur_url in enumerate(urls): diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py index f30f5ff5f..0ec4f335d 100644 --- a/qutebrowser/browser/webkit/webkitsettings.py +++ b/qutebrowser/browser/webkit/webkitsettings.py @@ -88,18 +88,6 @@ def _set_user_stylesheet(): QWebSettings.globalSettings().setUserStyleSheetUrl(url) -def _init_private_browsing(): - if qtutils.is_qtwebkit_ng(): - # WORKAROUND for https://github.com/annulen/webkit/issues/54 - message.warning("Private browsing is not fully implemented by " - "QtWebKit-NG!") - elif not qtutils.version_check('5.4.2'): - # WORKAROUND for https://codereview.qt-project.org/#/c/108936/ - # Won't work when private browsing is not enabled globally, but that's - # the best we can do... - QWebSettings.setIconDatabasePath('') - - def update_settings(section, option): """Update global settings when qwebsettings changed.""" if section == 'ui' and option in ['hide-scrollbar', 'user-stylesheet']: @@ -121,8 +109,12 @@ def init(_args): QWebSettings.setOfflineStoragePath( os.path.join(data_path, 'offline-storage')) - if config.get('general', 'private-browsing'): - _init_private_browsing() + if (config.get('general', 'private-browsing') and + not qtutils.version_check('5.4.2')): + # WORKAROUND for https://codereview.qt-project.org/#/c/108936/ + # Won't work when private browsing is not enabled globally, but that's + # the best we can do... + QWebSettings.setIconDatabasePath('') websettings.init_mappings(MAPPINGS) _set_user_stylesheet()