diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-08 19:22:44 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-08 19:22:44 (GMT) |
| commit | 4027c52d9fb6ea1bca13e1f3a2bc5ac5032387e0 (patch) | |
| tree | 6a2a744e57989728c67c49afb9e2f07ec35e6d2a /tools/qdoc3 | |
| parent | deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe (diff) | |
| download | Qt-4027c52d9fb6ea1bca13e1f3a2bc5ac5032387e0.zip Qt-4027c52d9fb6ea1bca13e1f3a2bc5ac5032387e0.tar.gz Qt-4027c52d9fb6ea1bca13e1f3a2bc5ac5032387e0.tar.bz2 | |
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
The documentation root in the qdocconf file now refers to the Chinese
title for the Tutorials page.
Modified qdoc's function to canonicalize titles so that it preserves
characters that outside the range of ASCII letters and numbers.
Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 17a6efd..ad4cdde 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -3056,7 +3056,8 @@ QString Doc::canonicalTitle(const QString &title) slurping = true; } else { - // !alnum && slurping -> nothin + result += title[i]; + lastAlnum = result.size(); } } result.truncate(lastAlnum); diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 29560a2..18b72a1 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -27,9 +27,8 @@ qhp.projects = Qt qhp.Qt.file = qt.qhp qhp.Qt.namespace = com.trolltech.qt.470 qhp.Qt.virtualFolder = qdoc -qhp.Qt.title = Tutorials -qhp.Qt.indexTitle = Tutorials -qhp.Qt.indexRoot = tutorials.html +qhp.Qt.title = 教程 +qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc zh_CN |