diff options
| -rw-r--r-- | doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/zh_CN/getting-started/tutorials.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/zh_CN/tutorials/addressbook.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/zh_CN/tutorials/widgets-tutorial.qdoc | 4 | ||||
| -rw-r--r-- | tools/qdoc3/doc.cpp | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 5 |
6 files changed, 11 insertions, 14 deletions
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc index 5f95dde..1c2f56b 100644 --- a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc +++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc @@ -43,7 +43,7 @@ \page how-to-learn-qt.html \title 如何学习 Qt \brief Links to guides and resources for learning Qt. - \nextpage Tutorials + \nextpage 教程 \section1 Getting Started diff --git a/doc/src/zh_CN/getting-started/tutorials.qdoc b/doc/src/zh_CN/getting-started/tutorials.qdoc index 56d147e..dc371d8 100644 --- a/doc/src/zh_CN/getting-started/tutorials.qdoc +++ b/doc/src/zh_CN/getting-started/tutorials.qdoc @@ -41,15 +41,12 @@ /*! \page tutorials.html - \title Tutorials + \title 教程 - \contentspage How to Learn Qt - \nextpage Qt Examples + \contentspage 如何学习 Qt \brief Tutorials, guides and overviews to help you learn Qt. - \nextpage Qt Examples - A collection of tutorials and "walkthrough" guides are provided with Qt to help new users get started with Qt development. These documents cover a range of topics, from basic use of widgets to step-by-step tutorials that diff --git a/doc/src/zh_CN/tutorials/addressbook.qdoc b/doc/src/zh_CN/tutorials/addressbook.qdoc index 5bd0d35..72349af 100644 --- a/doc/src/zh_CN/tutorials/addressbook.qdoc +++ b/doc/src/zh_CN/tutorials/addressbook.qdoc @@ -43,7 +43,7 @@ \page tutorials-addressbook.html \startpage {index.html}{Qt Reference Documentation} - \contentspage Tutorials + \contentspage 教程 \nextpage {tutorials/addressbook/part1}{第一章} \title 地址簿教程 @@ -176,7 +176,7 @@ /*! \page tutorials-addressbook-part2.html - \previouspage 地址簿 1 — 设计用户接口 + \previouspage 地址簿 1 — 设计用户界面 \contentspage {地址簿教程}{目录} \nextpage {tutorials/addressbook/part3}{第三章} \example tutorials/addressbook/part2 diff --git a/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc index 0e90210..90ef4f3 100644 --- a/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc +++ b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc @@ -46,7 +46,7 @@ they are used to build GUI applications. \startpage {index.html}{Qt Reference Documentation} - \contentspage Tutorials + \contentspage 教程 \nextpage {Widgets 教程 — 创建窗口} @@ -197,7 +197,7 @@ \contentspage {Widgets 教程}{目录} \previouspage {Widgets 教程 — 使用布局} \example tutorials/widgets/nestedlayouts - \title Widgets 教程 - Nested Layouts + \title Widgets 教程 — Nested Layouts 由于 widget 可包含其他 widget，布局可用来提供按不同层次分组的 widget。这里，我们要在显示查询结果的表视图上方、窗口顶部的行编辑框旁，显示一个标签。 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 |