diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
tree | 2b89637b93fc7d81c674106008566010f986d67c /src/tools/qdoc/atom.cpp | |
parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'src/tools/qdoc/atom.cpp')
-rw-r--r-- | src/tools/qdoc/atom.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp index 777240c831..8743efa6c4 100644 --- a/src/tools/qdoc/atom.cpp +++ b/src/tools/qdoc/atom.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qregexp.h> +#include <QRegExp> #include "atom.h" #include "location.h" #include <stdio.h> @@ -55,6 +55,7 @@ QLatin1String Atom::SPAN_ ("span"); QLatin1String Atom::SUBSCRIPT_ ("subscript"); QLatin1String Atom::SUPERSCRIPT_ ("superscript"); QLatin1String Atom::TELETYPE_ ("teletype"); +QLatin1String Atom::UICONTROL_ ("uicontrol"); QLatin1String Atom::UNDERLINE_ ("underline"); QLatin1String Atom::BULLET_ ("bullet"); @@ -196,6 +197,7 @@ static const struct { { "FormattingRight", Atom::FormattingRight }, { "GeneratedList", Atom::GeneratedList }, { "GuidLink", Atom::GuidLink}, + { "hr", Atom::HR}, { "Image", Atom::Image }, { "ImageText", Atom::ImageText }, { "ImportantLeft", Atom::ImportantLeft }, |