diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
| commit | 1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (patch) | |
| tree | 3842506134728d52e9b0340d2fdd50b2d7e0cace /src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | |
| parent | 2b4d2fd1ada524f4780dd7633ca34bc72d823ff1 (diff) | |
| parent | eba8e2c10c5bc1b373fdf7640962029cb2e7908f (diff) | |
| download | Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.zip Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.gz Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.bz2 | |
Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into integration
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index c6dd550..d3f5502 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -20,8 +20,9 @@ scripted with JavaScript. A bridge between the JavaScript execution environment and the Qt object - model makes it possible for custom QObjects to be scripted. Integration - with the Qt networking module enables Web pages to be transparently loaded + model makes it possible for custom QObjects to be scripted. For detailed + documentation see \l{The QtWebkit Bridge}. + Integration with the Qt networking module enables Web pages to be transparently loaded from Web servers, the local file system or even the Qt resource system. In addition to providing pure rendering features, HTML documents can be |