diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 10:41:02 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 10:43:54 (GMT) |
| commit | 225b516ea21e841ee52d2f3edb426eb781ab0c8d (patch) | |
| tree | c1a873d0301409279428c617d7577ab10203f1e1 /tools/qdoc3 | |
| parent | fbdf2d74f010c85c85af4ee9ea793039cccf2354 (diff) | |
| download | Qt-225b516ea21e841ee52d2f3edb426eb781ab0c8d.zip Qt-225b516ea21e841ee52d2f3edb426eb781ab0c8d.tar.gz Qt-225b516ea21e841ee52d2f3edb426eb781ab0c8d.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 242472777d440a540b4bc944c84eb522388e384e )
Changes in WebKit since the last update:
++ b/ChangeLog
2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Added support for generating API docs in the Qt build using "make docs"
* WebKit.pro: Include docs.pri for "make docs" target.
++ b/WebKit/qt/ChangeLog
2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Added support for generating API docs in the Qt build using "make docs"
Added code snippets and overview from the Qt sources references in the API docs.
* Api/qwebpage.cpp: Adjust paths to snippets.
* Api/qwebview.cpp: Ditto.
* docs/docs.pri: Added.
* docs/qtwebkit.qdoc: Added.
* docs/qtwebkit.qdocconf: Added.
* docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added.
* docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added.
* docs/webkitsnippets/simple/main.cpp: Added.
* docs/webkitsnippets/simple/simple.pro: Added.
* docs/webkitsnippets/webpage/main.cpp: Added.
* docs/webkitsnippets/webpage/webpage.pro: Added.
Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit
This is needed to have "make docs" inside WebKit and allows contributors to the
WebKit project to write API docs. I'm doing the change in 4.5 to simplify
merging with Qt 4.6.
Reviewed-by: Trust me
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-inc.qdocconf | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 14e48a9..a1baf2f 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -105,7 +105,8 @@ exampledirs = $QT_SOURCE_TREE/doc/src \ $QT_SOURCE_TREE/examples \ $QT_SOURCE_TREE/examples/tutorials \ $QT_SOURCE_TREE \ - $QT_SOURCE_TREE/qmake/examples + $QT_SOURCE_TREE/qmake/examples \ + $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QT_SOURCE_TREE/doc/src/images \ $QT_SOURCE_TREE/examples outputdir = $QT_BUILD_TREE/doc/html diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 18d3faf..7255a67 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -20,7 +20,8 @@ headerdirs = $QDOC_CURRENT_DIR exampledirs = $QTDIR/doc/src \ $QTDIR/examples \ $QTDIR \ - $QTDIR/qmake/examples + $QTDIR/qmake/examples \ + $QTDIR/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QTDIR/doc/src/images \ $QTDIR/examples outputdir = $QTDIR/doc/html diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index f7e774d..8859511 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -107,7 +107,8 @@ exampledirs = $QTDIR/doc/src \ $QTDIR/examples \ $QTDIR/examples/tutorials \ $QTDIR \ - $QTDIR/qmake/examples + $QTDIR/qmake/examples \ + $QTDIR/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QTDIR/doc/src/images \ $QTDIR/examples outputdir = $QTDIR/doc/html |