diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
| commit | 2a898e4736dcafbe95dca120b2365bc24b395302 (patch) | |
| tree | 3031380514df8b82e423ded0401610bcbf89b6cf /tools/qdoc3/atom.h | |
| parent | 8b3fad1f7ac9bef0119fffc67feb5bb153abc647 (diff) | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| download | Qt-2a898e4736dcafbe95dca120b2365bc24b395302.zip Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.gz Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.bz2 | |
Merge remote branch 'qt/master' into qml-master
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
Diffstat (limited to 'tools/qdoc3/atom.h')
| -rw-r--r-- | tools/qdoc3/atom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h index d13afbc..70fbae9 100644 --- a/tools/qdoc3/atom.h +++ b/tools/qdoc3/atom.h @@ -103,7 +103,7 @@ class Atom ParaRight, #ifdef QDOC_QML Qml, - QDeclarativeText, + QmlText, #endif QuotationLeft, QuotationRight, |