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

Remove QtWebKit-NG warnings

Browse Source 
The next release will support private browsing, and we can't easily check the
version somehow.
This commit is contained in:
Florian Bruhin 2017-05-10 07:07:06 +02:00
parent 9805b43c85
commit cde36f34b0
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/commands.py
View File

@ -256,11 +256,6 @@ class CommandDispatcher:
urls = self._parse_url_input(url) urls = self._parse_url_input(url)
if private: 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 window = True
for i, cur_url in enumerate(urls): for i, cur_url in enumerate(urls):

20
qutebrowser/browser/webkit/webkitsettings.py
View File

@ -88,18 +88,6 @@ def _set_user_stylesheet():
QWebSettings.globalSettings().setUserStyleSheetUrl(url) 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): def update_settings(section, option):
"""Update global settings when qwebsettings changed.""" """Update global settings when qwebsettings changed."""
if section == 'ui' and option in ['hide-scrollbar', 'user-stylesheet']: if section == 'ui' and option in ['hide-scrollbar', 'user-stylesheet']:
@ -121,8 +109,12 @@ def init(_args):
QWebSettings.setOfflineStoragePath( QWebSettings.setOfflineStoragePath(
os.path.join(data_path, 'offline-storage')) os.path.join(data_path, 'offline-storage'))
if config.get('general', 'private-browsing'): if (config.get('general', 'private-browsing') and
_init_private_browsing() 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) websettings.init_mappings(MAPPINGS)
_set_user_stylesheet() _set_user_stylesheet()