summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt.qdocconf
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-12-04 14:02:35 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-12-04 14:02:35 (GMT)
commit33441e2a611f07207b0b942368aab9010cdf8ab1 (patch)
tree77a223255bab621549f340c86fe19005f1ebbc62 /tools/qdoc3/test/qt.qdocconf
parent77f274672480e5980d9f42e4fd94c9770279543b (diff)
parentb6cf9e28c2fef9112789e98ac9d1eda45a407889 (diff)
downloadQt-33441e2a611f07207b0b942368aab9010cdf8ab1.zip
Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.gz
Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
-rw-r--r--tools/qdoc3/test/qt.qdocconf6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 58bb2a3..a99f73e 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -34,9 +34,9 @@ qhp.Qt.extraFiles = classic.css \
images/dynamiclayouts-example.png \
images/stylesheet-coffee-plastique.png
-qhp.Qt.filterAttributes = qt 4.6.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.6.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.0
+qhp.Qt.filterAttributes = qt 4.6.1 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
qhp.Qt.subprojects = classes overviews examples
qhp.Qt.subprojects.classes.title = Classes
qhp.Qt.subprojects.classes.indexTitle = Qt's Classes