diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
| commit | c29533ab2094c38bb63d50dd6306cfe6ccacc868 (patch) | |
| tree | e539b2062c870dd431f522d1d1e0677008eaa717 /tools/qdoc3/atom.cpp | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff) | |
| download | Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.zip Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.gz Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
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 }, |