diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h | |
parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h')
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h index f978a5bd2..2b4c804ff 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h @@ -38,7 +38,6 @@ public: DnsPrefetchEnabled, DeveloperExtrasEnabled, WebGLEnabled, - CSSCustomFilterEnabled, WebAudioEnabled, CaretBrowsingEnabled, NotificationsEnabled, |