diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-04-29 07:01:56 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-04-29 07:01:56 (GMT) |
| commit | 9bcade632b72da7384d0b006c8d9db26d2f4baa1 (patch) | |
| tree | 8fa48e5fa27db70268894989c8baa4f623383d70 /tools/qdoc3/test/qt-inc.qdocconf | |
| parent | c01d432060dccca5bc22dc5fd86eae97e1df8231 (diff) | |
| parent | 86aa54ba75101121a55d340620d2273b82e6143d (diff) | |
| download | Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.zip Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.gz Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qdoc3/test/qt-inc.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-inc.qdocconf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 97893dc..d6cb0e6 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -3,7 +3,7 @@ include(macros.qdocconf) project = Qt description = Qt Reference Documentation -url = http://doc.trolltech.com/4.5 +url = http://doc.qtsoftware.com/4.5 edition.Console = QtCore QtNetwork QtSql QtXml QtScript QtTest edition.Desktop = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \ @@ -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 @@ -140,7 +141,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\">Copyright © %THISYEAR% <a href=\"trolltech.html\">Trolltech</a></td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \ "</tr></table></div></address>" |