diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
| commit | 10ee284f7722c2479e85d469b179c9311b10238a (patch) | |
| tree | f763d60087111ed6210812b3d028a07513807996 /src/3rdparty/webkit/WebKit | |
| parent | 1ec06a42b2b18b850b5ede133d1c23a00e6dbe21 (diff) | |
| parent | f95e0d4dee769363a9c84b27f854055b0425e6ec (diff) | |
| download | Qt-10ee284f7722c2479e85d469b179c9311b10238a.zip Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.gz Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qml.h
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index 411762a..9e653e4 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -83,9 +83,6 @@ QtWebKit is based on the Open Source WebKit engine. More information about WebKit itself can be found on the \l{WebKit Open Source Project} Web site. - The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the - \l{Open Source Versions of Qt}. - \note Building the QtWebKit module with debugging symbols is problematic on many platforms due to the size of the WebKit engine. We recommend building the module only in release mode for embedded platforms. |