summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
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 /src/gui/widgets
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 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qtextedit.cpp7
1 files changed, 6 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)