summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/atom.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-05-11 12:51:56 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-05-11 12:51:56 (GMT)
commit153fa2771662810557b775d07453fd3d1064ed66 (patch)
tree5c5cc6358d0575d97555e8323a6999a5b6ae2981 /tools/qdoc3/atom.cpp
parent767aa20e1033fe9283f89f4bda09bc015a4b08e6 (diff)
downloadQt-153fa2771662810557b775d07453fd3d1064ed66.zip
Qt-153fa2771662810557b775d07453fd3d1064ed66.tar.gz
Qt-153fa2771662810557b775d07453fd3d1064ed66.tar.bz2
doc: Fixed QTBUG-18791
Diffstat (limited to 'tools/qdoc3/atom.cpp')
-rw-r--r--tools/qdoc3/atom.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index 2d50e5a..f2a5af9 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -184,9 +184,7 @@ static const struct {
{ "CodeQuoteCommand", Atom::CodeQuoteCommand },
{ "DivLeft", Atom::DivLeft },
{ "DivRight", Atom::DivRight },
-#ifdef QDOC_QML
{ "EndQmlText", Atom::EndQmlText },
-#endif
{ "FootnoteLeft", Atom::FootnoteLeft },
{ "FootnoteRight", Atom::FootnoteRight },
{ "FormatElse", Atom::FormatElse },
@@ -199,6 +197,8 @@ static const struct {
{ "Image", Atom::Image },
{ "ImageText", Atom::ImageText },
{ "InlineImage", Atom::InlineImage },
+ { "JavaScript", Atom::JavaScript },
+ { "EndJavaScript", Atom::EndJavaScript },
{ "LegaleseLeft", Atom::LegaleseLeft },
{ "LegaleseRight", Atom::LegaleseRight },
{ "LineBreak", Atom::LineBreak },
@@ -214,10 +214,8 @@ static const struct {
{ "Nop", Atom::Nop },
{ "ParaLeft", Atom::ParaLeft },
{ "ParaRight", Atom::ParaRight },
-#ifdef QDOC_QML
{ "Qml", Atom::Qml},
{ "QmlText", Atom::QmlText },
-#endif
{ "QuotationLeft", Atom::QuotationLeft },
{ "QuotationRight", Atom::QuotationRight },
{ "RawString", Atom::RawString },