diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
| commit | 39fde39430870467c41fbddd79b2b2d8788e45e2 (patch) | |
| tree | aa3a7e99604e0f4eb4b6e95ee28a9824fe8023bc /tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | |
| parent | 88a86d8e2c82edf53b56afcc2f80fffd32a18e49 (diff) | |
| parent | 1cbae5156277887bff3328304381d3436438a1ad (diff) | |
| download | Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.zip Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.gz Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index cfcc76d..7789bf7 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -17,15 +17,15 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.471 +qhp.Qt.namespace = com.trolltech.qt.472 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = 教程 qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example -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 +qhp.Qt.filterAttributes = qt 4.7.2 qtrefdoc zh_CN +qhp.Qt.customFilters.Qt.name = Qt 4.7.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML |