diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:31:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 11:31:32 +0200 |
| commit | 150b8ca29417de2cd423ff92478eaf4cb2906601 (patch) | |
| tree | aa1c43ee9d096a4464636bcb5f294a11846572f4 /src/corelib/global/qglobal.cpp | |
| parent | bd78389fc4fe0a4367696ba2fdcc6e8d09863698 (diff) | |
| parent | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5b1a7dbbcb..41a9c0d950 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -717,6 +717,10 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); A message generated by the qCritical() function. \value QtFatalMsg A message generated by the qFatal() function. + \value QtTraceMsg + Used by the qCTrace() macro. Trace events are usually passed only + to dedicated \a QTracer objects, and do not appear in the installed + message handler. \value QtSystemMsg |