diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-06 17:49:17 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 17:49:17 (GMT) |
| commit | 6834727fff1f74e15b2c9f25af1845e7f529afaa (patch) | |
| tree | d3a64f80c5e5c78a8401382925bc91437ca453fc /tools/qdoc3/doc.cpp | |
| parent | 94cccc8b971eda3e0330950111c7988f3dd87309 (diff) | |
| download | Qt-6834727fff1f74e15b2c9f25af1845e7f529afaa.zip Qt-6834727fff1f74e15b2c9f25af1845e7f529afaa.tar.gz Qt-6834727fff1f74e15b2c9f25af1845e7f529afaa.tar.bz2 | |
Forced the \qml command to use the QML code marker.
Diffstat (limited to 'tools/qdoc3/doc.cpp')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 4152207..f153dfb 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -549,7 +549,7 @@ void DocParser::parse(const QString& source, #ifdef QDOC_QML case CMD_QML: leavePara(); - append(Atom::Qml, getCode(CMD_QML, marker)); + append(Atom::Qml, getCode(CMD_QML, CodeMarker::markerForLanguage(QLatin1String("QML")))); break; case CMD_QMLTEXT: append(Atom::QmlText); @@ -2252,7 +2252,8 @@ QString DocParser::getCode(int cmd, CodeMarker *marker) if (indent < minIndent) minIndent = indent; code = unindent(minIndent, code); - marker = CodeMarker::markerForCode(code); + if (!marker) + marker = CodeMarker::markerForCode(code); return marker->markedUpCode(code, 0, ""); } |