diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /src/tools/qdoc/quoter.cpp | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/tools/qdoc/quoter.cpp')
-rw-r--r-- | src/tools/qdoc/quoter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/qdoc/quoter.cpp b/src/tools/qdoc/quoter.cpp index 0c16acbe73..9ae2a31236 100644 --- a/src/tools/qdoc/quoter.cpp +++ b/src/tools/qdoc/quoter.cpp @@ -125,7 +125,7 @@ Quoter::Quoter() //! [<id>] * .pro, .py files: #! [<id>] - * .html, .qrc, .ui, .xq, .xml files: + * .html, .qrc, .ui, .xq, .xml .dita files: <!-- [<id>] --> */ commentHash["pro"] = "#!"; @@ -134,6 +134,7 @@ Quoter::Quoter() commentHash["qrc"] = "<!--"; commentHash["ui"] = "<!--"; commentHash["xml"] = "<!--"; + commentHash["dita"] = "<!--"; commentHash["xq"] = "<!--"; } |