summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt.qdocconf
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-24 10:45:19 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-24 10:45:19 (GMT)
commit8b3df114cbb0f1961987b3660c1d51437dd911bf (patch)
tree2d8d576c9ffec2f3bd4a71c4f0263ade225d7987 /tools/qdoc3/test/qt.qdocconf
parented3b35cff7ed7663971665e67d3a4037da8bd158 (diff)
parent225b516ea21e841ee52d2f3edb426eb781ab0c8d (diff)
downloadQt-8b3df114cbb0f1961987b3660c1d51437dd911bf.zip
Qt-8b3df114cbb0f1961987b3660c1d51437dd911bf.tar.gz
Qt-8b3df114cbb0f1961987b3660c1d51437dd911bf.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
-rw-r--r--tools/qdoc3/test/qt.qdocconf3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 78a667f..41a918b 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