diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
| commit | 427c35771a83cce39f5f48c188c180d35ef6ecc9 (patch) | |
| tree | 31164c83e5cf610cee9c505e857141866995664d /tools/qdoc3/test/qt.qdocconf | |
| parent | 7a35cb66f1ca6e90655ece3c726f8d2c01c68b53 (diff) | |
| parent | f65e60b49395d68be78259ec82c9969b267e591c (diff) | |
| download | Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.zip Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.gz Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index ac86348..e1ce8d3 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -8,7 +8,7 @@ project = Qt versionsym = version = %VERSION% description = Qt Reference Documentation -url = http://doc.trolltech.com/4.5 +url = http://doc.qtsoftware.com/4.5 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.451 +qhp.Qt.namespace = com.trolltech.qt.452 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = @@ -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 \ $QTDIR/doc/src/declarative/pics |