diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
| commit | 0e7e62eb6afbc1f20d08b837643009cec8eaacb9 (patch) | |
| tree | 1eb5f9fb0194b8a9ffa1d9ab961a0ac68db7508a /tools/qdoc3/test | |
| parent | b88bcd68a62ab8ed348bc698f7342346963bb7c0 (diff) | |
| parent | 421e02d7b48b4a852a4aa1e6feb781a64f0981b4 (diff) | |
| download | Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.zip Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.gz Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.bz2 | |
Merge commit 'origin/4.6' into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/eclipse-integration.qdocconf | 6 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 2 | ||||
| -rw-r--r-- | tools/qdoc3/test/standalone-eclipse-integration.qdocconf | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/qdoc3/test/eclipse-integration.qdocconf b/tools/qdoc3/test/eclipse-integration.qdocconf index aadaae6..13d8ab9 100644 --- a/tools/qdoc3/test/eclipse-integration.qdocconf +++ b/tools/qdoc3/test/eclipse-integration.qdocconf @@ -2,9 +2,9 @@ include(qt.qdocconf) headerdirs = sourcedirs = -sourcedirs = $QTDIR/../qteclipsetools/main/doc -imagedirs = $QTDIR/../qteclipsetools/main/doc -outputdir = $QTDIR/../qteclipsetools/main/doc/html +sourcedirs = $QTDIR/../qteclipsetools/eclipse_patched/doc +imagedirs = $QTDIR/../qteclipsetools/eclipse_patched/doc +outputdir = $QTDIR/../qteclipsetools/eclipse_patched/doc/html project = Qt Eclipse Integration description = "Qt Eclipse Integration" diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index f9e3c35..7ceacb2 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -10,6 +10,8 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 "<font color=\"#004faf\">Home</font></a> ·" \ " <a href=\"classes.html\">" \ "<font color=\"#004faf\">All Classes</font></a> ·" \ + " <a href=\"functions.html\">" \ + "<font color=\"#004faf\">All Functions</font></a> ·" \ " <a href=\"overviews.html\">" \ "<font color=\"#004faf\">Overviews</font></a>" \ "</td>" \ diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index d61db54..b96c541 100644 --- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf @@ -7,5 +7,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td width=\"30%\" align=\"left\">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \ - "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.2</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \ "</tr></table></div></address>" |