Add tracing to logging framework

Change-Id: I4d5b9a24a214785019ff1238c1790ead79205b15
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index a82e6f65f4..885b51709d 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -86,6 +86,9 @@ int QLoggingRule::pass(const QString &categoryName, QtMsgType msgType) const
     case QtCriticalMsg:
         fullCategory += QLatin1String(".critical");
         break;
+    case QtTraceMsg:
+        fullCategory += QLatin1String(".trace");
+        break;
     default:
         break;
     }
@@ -288,6 +291,7 @@ void QLoggingRegistry::defaultCategoryFilter(QLoggingCategory *cat)
     bool debug = (cat->categoryName() == qtDefaultCategoryName);
     bool warning = true;
     bool critical = true;
+    bool trace = true;
 
     QString categoryName = QLatin1String(cat->categoryName());
     QLoggingRegistry *reg = QLoggingRegistry::instance();
@@ -301,11 +305,15 @@ void QLoggingRegistry::defaultCategoryFilter(QLoggingCategory *cat)
         filterpass = item.pass(categoryName, QtCriticalMsg);
         if (filterpass != 0)
             critical = (filterpass > 0);
+        filterpass = item.pass(categoryName, QtTraceMsg);
+        if (filterpass != 0)
+            trace = (filterpass > 0);
     }
 
     cat->setEnabled(QtDebugMsg, debug);
     cat->setEnabled(QtWarningMsg, warning);
     cat->setEnabled(QtCriticalMsg, critical);
+    cat->setEnabled(QtTraceMsg, trace);
 }