diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
| commit | b68c5cd72b4fc58a1422a801e1c52c72be32f3d4 (patch) | |
| tree | 0de572352715008a541f52d8d17d377195469604 /tools/qdoc3/test | |
| parent | 9f80bac10f1ab5155999cb554559cd3dacab2bb9 (diff) | |
| parent | b9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31 (diff) | |
| download | Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.zip Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.gz Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/gui/kernel/qwidget_x11.cpp
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/eclipse-integration.qdocconf | 6 | ||||
| -rw-r--r-- | tools/qdoc3/test/standalone-eclipse-integration.qdocconf | 2 |
2 files changed, 4 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/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>" |