summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-03-24 21:39:41 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-03-24 21:39:41 (GMT)
commit1e4402497124f7e2c51793a58f03c2b98512f256 (patch)
treeae8661247b40f4bdfd7958c5535abf0de3fe4f75 /src/gui/widgets
parent4710365249f35556d27e49b56be7fb4a667a096a (diff)
parentdb3c3ca5d4b746bedbc129b647a700df94562192 (diff)
downloadQt-1e4402497124f7e2c51793a58f03c2b98512f256.zip
Qt-1e4402497124f7e2c51793a58f03c2b98512f256.tar.gz
Qt-1e4402497124f7e2c51793a58f03c2b98512f256.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.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index b239e32..01ab884 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -1478,7 +1478,8 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e)
layout->setViewport(QRect());
}
-/*! \reimp
+/*! \warning The underlying text document must not be modified from within a reimplementation
+of this function.
*/
void QTextEdit::paintEvent(QPaintEvent *e)
{