diff options
author | Kai Koehne <kai.koehne@digia.com> | 2013-11-04 16:12:32 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-07 11:29:30 +0100 |
commit | 79b975756a100cc46182c2949e71a683a656bd12 (patch) | |
tree | 970215a813cabe11ebe1445a249adfcad721b43f /src/corelib/global | |
parent | 0491a7a2984393266e3be48f09b20a8deab9f4c8 (diff) |
Revert "Add tracing to logging framework"
The tracing API still misses some real-world exposure. Let's
re-do this in dev to have more time.
This reverts parts of following commits:
466e0dff4bb686e51d0ab3f905631fcb7dd8bfef
7a47aebe9ed41d6cd9c9bcd45758d4d553668e99
a652bab6a7ebf78b029fea95c2801deb6f4f524a
8f0654ceb878b6c8a08c7f5b790027c26e007c13
4162522edd9d31bd2798ab37f083adff818d886e
32f27b4367c4e042a3f0cda671579494e31c1d69
9ff81bdc1ab4e3d14914192cd63ae625a507fe90
Change-Id: If97340c37b8b3363f597683336a8390d5ff386f1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 4 | ||||
-rw-r--r-- | src/corelib/global/qlogging.cpp | 2 | ||||
-rw-r--r-- | src/corelib/global/qlogging.h | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a874b231cc..b27d0bf53f 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -729,10 +729,6 @@ Q_STATIC_ASSERT_X(UCHAR_MAX == 255, "Qt assumes that char is 8 bits"); 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 diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 0a261acc77..cc20891c76 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -816,7 +816,6 @@ Q_CORE_EXPORT QString qMessageFormatString(QtMsgType type, const QMessageLogCont case QtWarningMsg: message.append(QLatin1String("warning")); break; case QtCriticalMsg:message.append(QLatin1String("critical")); break; case QtFatalMsg: message.append(QLatin1String("fatal")); break; - case QtTraceMsg: message.append(QLatin1String("trace")); break; } } else if (token == fileTokenC) { if (context.file) @@ -874,7 +873,6 @@ static void android_default_message_handler(QtMsgType type, { android_LogPriority priority; switch (type) { - case QtTraceMsg: case QtDebugMsg: priority = ANDROID_LOG_DEBUG; break; case QtWarningMsg: priority = ANDROID_LOG_WARN; break; case QtCriticalMsg: priority = ANDROID_LOG_ERROR; break; diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 68a24d0397..2b798f9ea0 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QDebug; class QNoDebug; -enum QtMsgType { QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg, QtTraceMsg, QtSystemMsg = QtCriticalMsg }; +enum QtMsgType { QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg, QtSystemMsg = QtCriticalMsg }; class QMessageLogContext { |