diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 12:01:04 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 12:01:04 (GMT) |
| commit | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (patch) | |
| tree | e4c99e89cbecd2084a87a8c7a5d4877385fcec1c /tools/qdoc3/atom.cpp | |
| parent | bb2e4df9bee3148e819c98410aa36e22dad95d7a (diff) | |
| parent | e85867003ca1741f378b1f58f4dd9d48577a5d9b (diff) | |
| download | Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.zip Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.gz Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'tools/qdoc3/atom.cpp')
| -rw-r--r-- | tools/qdoc3/atom.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp index a764653..f341862 100644 --- a/tools/qdoc3/atom.cpp +++ b/tools/qdoc3/atom.cpp @@ -106,6 +106,7 @@ QString Atom::UPPERROMAN_ ("upperroman"); \value CodeOld \value CodeQuoteArgument \value CodeQuoteCommand + \value EndQmlText \value FormatElse \value FormatEndif \value FormatIf @@ -131,6 +132,7 @@ QString Atom::UPPERROMAN_ ("upperroman"); \value ParaLeft \value ParaRight \value Qml + \value QmlText \value QuotationLeft \value QuotationRight \value RawString @@ -174,6 +176,9 @@ static const struct { { "CodeOld", Atom::CodeOld }, { "CodeQuoteArgument", Atom::CodeQuoteArgument }, { "CodeQuoteCommand", Atom::CodeQuoteCommand }, +#ifdef QDOC_QML + { "EndQmlText", Atom::EndQmlText }, +#endif { "FootnoteLeft", Atom::FootnoteLeft }, { "FootnoteRight", Atom::FootnoteRight }, { "FormatElse", Atom::FormatElse }, @@ -202,6 +207,7 @@ static const struct { { "ParaRight", Atom::ParaRight }, #ifdef QDOC_QML { "Qml", Atom::Qml}, + { "QmlText", Atom::QmlText }, #endif { "QuotationLeft", Atom::QuotationLeft }, { "QuotationRight", Atom::QuotationRight }, |