summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-03-26 21:44:46 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-03-26 21:44:46 (GMT)
commit4b3d81c629167a24424119ca4f296a85b78eab05 (patch)
tree7111ec107798ec49ee528a0a9aee496342c8b8a4 /tools
parent20ec83dc4c19436092262ab46615c19c9c8b20e7 (diff)
parent9508cfea4731f86664794455c4d3571e41e180fd (diff)
downloadQt-4b3d81c629167a24424119ca4f296a85b78eab05.zip
Qt-4b3d81c629167a24424119ca4f296a85b78eab05.tar.gz
Qt-4b3d81c629167a24424119ca4f296a85b78eab05.tar.bz2
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/macros.qdocconf2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf
index d14f80a..85fe1db 100644
--- a/tools/qdoc3/test/macros.qdocconf
+++ b/tools/qdoc3/test/macros.qdocconf
@@ -23,5 +23,7 @@ macro.rarrow.HTML = "&rarr;"
macro.reg.HTML = "<sup>&reg;</sup>"
macro.return = "Returns"
macro.starslash = "\\c{*/}"
+macro.begincomment = "\\c{/*}"
+macro.endcomment = "\\c{*/}"
macro.uuml.HTML = "&uuml;"
macro.mdash.HTML = "&mdash;"