diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 08:57:19 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-16 08:57:32 (GMT) |
commit | 94e39aff7dd02d4a631d5c40c6f5a5f6fa424035 (patch) | |
tree | 7c68b7640835c1f4c681afb8acbacfdfc2a0fc32 /src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | |
parent | 6e8568ff784e093460e4383e32e064a49165c3a8 (diff) | |
download | Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.zip Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.gz Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.bz2 |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.6-staging ( 751940f0f1fb2599250632d7f0a3ead3930466af )
Changes in WebKit since the last update:
++ b/WebKit/qt/ChangeLog
2009-06-16 David Boddie <dboddie@trolltech.com>
Reviewed by Simon Hausmann.
Doc: Fixed QWebPage::forwardUnsupportedContent documentation and added
more information about Web plugins.
* Api/qwebpage.cpp:
* Api/qwebsettings.cpp:
* docs/qtwebkit.qdoc:
2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com>
Reviewed by Ariya Hidayat.
Clearifying QWebFrame docs
Adding docs to toHtml() and toPlainText()
* Api/qwebframe.cpp:
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index 8192e68..cc49499 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -223,17 +223,25 @@ QWebSettings *QWebSettings::globalSettings() Each QWebPage object has its own QWebSettings object, which configures the settings for that page. If a setting is not configured, then it is looked up in the global settings object, which can be accessed using - QWebSettings::globalSettings(). + globalSettings(). - QWebSettings allows configuring font properties such as font size and font - family, the location of a custom stylesheet, and generic attributes like java - script, plugins, etc. The \l{QWebSettings::WebAttribute}{WebAttribute} - enum further describes this. + QWebSettings allows configuration of browser properties, such as font sizes and + families, the location of a custom style sheet, and generic attributes like + JavaScript and plugins. Individual attributes are set using the setAttribute() + function. The \l{QWebSettings::WebAttribute}{WebAttribute} enum further describes + each attribute. - QWebSettings also configures global properties such as the web page memory - cache and the web page icon database, local database storage and offline + QWebSettings also configures global properties such as the Web page memory + cache and the Web page icon database, local database storage and offline applications storage. + \section1 Enabling Plugins + + Support for browser plugins can enabled by setting the + \l{QWebSettings::PluginsEnabled}{PluginsEnabled} attribute. For many applications, + this attribute is enabled for all pages by setting it on the + \l{globalSettings()}{global settings object}. + \section1 Web Application Support WebKit provides support for features specified in \l{HTML 5} that improve the |