summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-03-26 17:32:33 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-03-26 17:32:33 (GMT)
commit4b56481c749ba62bb2104bb340697dd597de73b8 (patch)
treec90beebac47259b252003a52ac2019a9c8db3c0d
parent0c525f9a973d64ef9392b74a59aabe9129d5e62c (diff)
downloadQt-4b56481c749ba62bb2104bb340697dd597de73b8.zip
Qt-4b56481c749ba62bb2104bb340697dd597de73b8.tar.gz
Qt-4b56481c749ba62bb2104bb340697dd597de73b8.tar.bz2
Squashed commit of the following:
commit 20864878d046b2ce6bf5fc54868be8df346ce0c8 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:30:32 2009 +0100 Doc: Fixed qdoc warning by adding more descriptive text. Reviewed-by: TrustMe commit 3b620a0a4d1b02105c9761384a5abc4ecf11e9d2 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:29:56 2009 +0100 Doc: Added macros for future use. Reviewed-by: TrustMe
-rw-r--r--src/gui/widgets/qtextedit.cpp7
-rw-r--r--tools/qdoc3/test/macros.qdocconf2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 01ab884..1c4df93 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -1478,7 +1478,12 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e)
layout->setViewport(QRect());
}
-/*! \warning The underlying text document must not be modified from within a reimplementation
+/*! \fn void QTextEdit::paintEvent(QPaintEvent *event)
+
+This event handler can be reimplemented in a subclass to receive paint events passed in \a event.
+It is usually unnecessary to reimplement this function in a subclass of QTextEdit.
+
+\warning The underlying text document must not be modified from within a reimplementation
of this function.
*/
void QTextEdit::paintEvent(QPaintEvent *e)
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;"