summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt_zh_CN.qdocconf
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-09-24 07:37:07 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-09-24 07:37:07 (GMT)
commitb21b3042c99cc400b523615f8331695f3a88da4b (patch)
treef1a36b5e6ca835297cabe7b9b469e5c7c523570f /tools/qdoc3/test/qt_zh_CN.qdocconf
parent4286d8d20eae7b0876acc5afcecebc03cfc2514a (diff)
parent9634e133db1bf50a55ed44b3fe01e49954c80d08 (diff)
downloadQt-b21b3042c99cc400b523615f8331695f3a88da4b.zip
Qt-b21b3042c99cc400b523615f8331695f3a88da4b.tar.gz
Qt-b21b3042c99cc400b523615f8331695f3a88da4b.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt_zh_CN.qdocconf')
-rw-r--r--tools/qdoc3/test/qt_zh_CN.qdocconf8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index 5bf8171..40d3d5a 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -19,15 +19,15 @@ indexes = $QTDIR/doc/html/qt.index
qhp.projects = Qt
qhp.Qt.file = qt.qhp
-qhp.Qt.namespace = com.trolltech.qt.470
+qhp.Qt.namespace = com.trolltech.qt.471
qhp.Qt.virtualFolder = qdoc
qhp.Qt.title = 教程
qhp.Qt.indexTitle = 教程
qhp.Qt.selectors = fake:example
-qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.7.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
# Files not referenced in any qdoc file (last four are needed by qtdemo)
# See also extraimages.HTML