Merge branch '4.5' of git@scm.dev.troll.no:qt/qt

3 files changed, 8 insertions, 6 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index e3075c3..459167e 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2033,11 +2033,12 @@ void qt_message_output(QtMsgType msgType, const char *buf)
 
     \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 25
 
-    This syntax automatically puts a single space between each item,
-    and outputs a newline at the end. It supports many C++ and Qt
-    types.
+    With this syntax, the function returns a QDebug object that is
+    configured to use the QtDebugMsg message type. It automatically
+    puts a single space between each item, and outputs a newline at
+    the end. It supports many C++ and Qt types.
 
-    To supress the output at runtime, install your own message handler
+    To suppress the output at run-time, install your own message handler
     with qInstallMsgHandler().
 
     \sa qWarning(), qCritical(), qFatal(), qInstallMsgHandler(),
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 3f1df5e..8c7e47d 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1656,7 +1656,7 @@ Qt::ButtonState QContextMenuEvent::state() const
     The variant contains a QLocale object specifying the language of a
     certain part of the preedit string. There should be at most one
     language set for every part of the preedit string. If several are
-    specified for any character in the string the behaviour is undefined.
+    specified for any character in the string the behavior is undefined.
 
     \value Ruby
     The ruby text for a part of the preedit string. There should be at
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)
 {