summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-03-24 16:59:09 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-03-24 16:59:09 (GMT)
commitdb3c3ca5d4b746bedbc129b647a700df94562192 (patch)
tree8bef78e06a5abec79d2ba66df90010a1ee3c7792 /src/corelib
parente18eac95ad4b69ebe53e51c65416f1c94275e10a (diff)
downloadQt-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/corelib')
-rw-r--r--src/corelib/global/qglobal.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 9f4af50..90020f7 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(),