diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index ba7187df7..768c80256 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -267,6 +267,14 @@ void QWebSettingsPrivate::apply() settings->setEnableScrollAnimator(value); #endif + value = attributes.value(QWebSettings::CaretBrowsingEnabled, + global->attributes.value(QWebSettings::CaretBrowsingEnabled)); + settings->setCaretBrowsingEnabled(value); + + value = attributes.value(QWebSettings::NotificationsEnabled, + global->attributes.value(QWebSettings::NotificationsEnabled)); + settings->setNotificationsEnabled(value); + value = attributes.value(QWebSettings::SiteSpecificQuirksEnabled, global->attributes.value(QWebSettings::SiteSpecificQuirksEnabled)); settings->setNeedsSiteSpecificQuirks(value); @@ -480,6 +488,9 @@ QWebSettings* QWebSettings::globalSettings() \value SiteSpecificQuirksEnabled This setting enables WebKit's workaround for broken sites. It is enabled by default. \value ScrollAnimatorEnabled This setting enables animated scrolling. It is disabled by default. + \value CaretBrowsingEnabled This setting enables caret browsing. It is disabled by default. + \value NotificationsEnabled Specifies whether support for the HTML 5 web notifications is enabled + or not. This is enabled by default. */ /*! @@ -532,6 +543,8 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false); d->attributes.insert(QWebSettings::SiteSpecificQuirksEnabled, true); d->attributes.insert(QWebSettings::ScrollAnimatorEnabled, false); + d->attributes.insert(QWebSettings::CaretBrowsingEnabled, false); + d->attributes.insert(QWebSettings::NotificationsEnabled, true); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; d->defaultTextEncoding = QLatin1String("iso-8859-1"); d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies; |