diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-03-24 16:59:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-03-24 16:59:09 (GMT) |
| commit | db3c3ca5d4b746bedbc129b647a700df94562192 (patch) | |
| tree | 8bef78e06a5abec79d2ba66df90010a1ee3c7792 /src/gui/widgets | |
| parent | e18eac95ad4b69ebe53e51c65416f1c94275e10a (diff) | |
| download | Qt-db3c3ca5d4b746bedbc129b647a700df94562192.zip Qt-db3c3ca5d4b746bedbc129b647a700df94562192.tar.gz Qt-db3c3ca5d4b746bedbc129b647a700df94562192.tar.bz2 | |
Squashed commit of the following:
commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620
Author: David Boddie <dboddie@trolltech.com>
Date: Tue Mar 24 16:55:41 2009 +0100
Removed internal, hidden documentation.
Also fixed the language used, slightly.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
commit 0a81cc2a6dfc98087de92e53d493bed56826642f
Merge: 4bd3eca... dd7b1f1...
Author: David Boddie <dboddie@trolltech.com>
Date: Tue Mar 24 15:24:32 2009 +0100
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
commit 4bd3eca8855bb2564e146be4d0a3bba836d20122
Merge: dc789e3... 1d1c52c...
Author: David Boddie <dboddie@trolltech.com>
Date: Mon Mar 23 19:20:05 2009 +0100
Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5
commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6
Merge: 6c5de23... 381b6cc...
Author: David Boddie <dboddie@trolltech.com>
Date: Mon Mar 23 19:17:37 2009 +0100
Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5
commit 6c5de23611baef3c6be59b94ebd29d901056c2fc
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 18:26:11 2009 +0100
Fixes: Doc: Fixed typo.
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 5d710cc183699513b1582507dcb4cddefb91c8ad
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 18:24:31 2009 +0100
Fixes: Doc: Made it clearer what qDebug() actually does.
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 1fae0b3b34bf066e2356671a5c6187485b2b587d
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 17:53:09 2009 +0100
Fixes: Doc: Added a note about not modifying the text document in a paint event handler.
Task-number: 246550
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 29662d44de9b42d811e60a1b57d871335888373a
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 17:04:07 2009 +0100
Fixes: Doc: Fixed styling of code in this tutorial.
Task-number: 247053
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 15:19:24 2009 +0100
Fixes: Doc: Note the use of just the name of a method rather than a complete signature.
Task-number: 247857
Reviewed-by: David Boddie <dboddie@trolltech.com>
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 3 |
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) { |