diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-09-21 13:29:38 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-09-21 13:30:53 (GMT) |
| commit | ec76b17145c6449a5d90a1052635f30971e7fa4d (patch) | |
| tree | 5815c51562bf4070b1710754292aff2ed34bc4da /tools | |
| parent | 00a8d21fff66cd2aec5ea0b6158a4f9923a6732f (diff) | |
| download | Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.zip Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.gz Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.bz2 | |
qdoc: Added \brief texts to all the since 4.6 functions.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 11 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index e27209c..c202d71 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -2668,13 +2668,18 @@ Text Doc::trimmedBriefText(const QString &className) const standardWording = false; } - if (!w.isEmpty() && (w.first() == "class" || w.first() == "widget" - || w.first() == "namespace" || w.first() == "header")) + if (!w.isEmpty() && ((w.first() == "class") || + (w.first() == "function") || + (w.first() == "macro") || + (w.first() == "widget") || + (w.first() == "namespace") || + (w.first() == "header"))) w.removeFirst(); else { location().warning( tr("Nonstandard wording in '\\%1' text for '%2' (" - "expected 'class', 'widget', 'namespace' or 'header')") + "expected 'class', 'function', 'macro', 'widget', " + "'namespace' or 'header')") .arg(COMMAND_BRIEF).arg(className)); standardWording = false; } diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 942d023..e989124 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt versionsym = -version = %VERSION% +version = 4.6 description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.6 |