summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
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/corelib/global
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/corelib/global')
-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 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(),