summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-build-docs.qdocconf
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-20 01:14:52 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-20 01:14:52 (GMT)
commit91a2da396fb476401e3b2c55ca7672a8b462ceca (patch)
treedc944bf7d6df0fc0e2b0bad290396084626dd898 /tools/qdoc3/test/qt-build-docs.qdocconf
parent530fd3831f012337d7460c4387ce82083ab3e144 (diff)
parent5f92bc9dd9f05f4824711b03406bdbe222ff73e9 (diff)
downloadQt-91a2da396fb476401e3b2c55ca7672a8b462ceca.zip
Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.gz
Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.bz2
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts: src/corelib/kernel/qobject.cpp
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 20f90e6..dee9a10 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -32,9 +32,9 @@ qhp.Qt.extraFiles = classic.css \
images/dynamiclayouts-example.png \
images/stylesheet-coffee-plastique.png
-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.filterAttributes = qt 4.6.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.2
qhp.Qt.subprojects = classes overviews examples
qhp.Qt.subprojects.classes.title = Classes
qhp.Qt.subprojects.classes.indexTitle = Qt's Classes