1 files changed, 27 insertions, 25 deletions

diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index 575150f148..3ce0a571b4 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "qloggingregistry_p.h"
-#include "qloggingcategory_p.h"
 
 #include <QtCore/qfile.h>
 #include <QtCore/qstandardpaths.h>
@@ -131,15 +130,15 @@ void QLoggingRule::parse(const QStringRef &pattern)
     // strip trailing ".messagetype"
     if (pattern.endsWith(QLatin1String(".debug"))) {
         p = QStringRef(pattern.string(), pattern.position(),
-                       pattern.length() - strlen(".debug"));
+                       pattern.length() - 6); // strlen(".debug")
         messageType = QtDebugMsg;
     } else if (pattern.endsWith(QLatin1String(".warning"))) {
         p = QStringRef(pattern.string(), pattern.position(),
-                       pattern.length() - strlen(".warning"));
+                       pattern.length() - 8); // strlen(".warning")
         messageType = QtWarningMsg;
     } else if (pattern.endsWith(QLatin1String(".critical"))) {
         p = QStringRef(pattern.string(), pattern.position(),
-                       pattern.length() - strlen(".critical"));
+                       pattern.length() - 9); // strlen(".critical")
         messageType = QtCriticalMsg;
     } else {
         p = pattern;
@@ -261,12 +260,12 @@ void QLoggingRegistry::init()
     if (!rulesFilePath.isEmpty()) {
         QFile file(QFile::decodeName(rulesFilePath));
         if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream stream(&file);
-            QLoggingSettingsParser parser;
-            parser.setContent(stream);
             if (qtLoggingDebug())
                 debugMsg("Loading \"%s\" ...",
                          QDir::toNativeSeparators(file.fileName()).toUtf8().constData());
+            QTextStream stream(&file);
+            QLoggingSettingsParser parser;
+            parser.setContent(stream);
             envRules = parser.rules();
         }
     }
@@ -285,12 +284,12 @@ void QLoggingRegistry::init()
     if (!envPath.isEmpty()) {
         QFile file(envPath);
         if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream stream(&file);
-            QLoggingSettingsParser parser;
-            parser.setContent(stream);
             if (qtLoggingDebug())
                 debugMsg("Loading \"%s\" ...",
                          QDir::toNativeSeparators(envPath).toUtf8().constData());
+            QTextStream stream(&file);
+            QLoggingSettingsParser parser;
+            parser.setContent(stream);
             configRules = parser.rules();
         }
     }
@@ -307,12 +306,12 @@ void QLoggingRegistry::init()
 
     This method might be called concurrently for the same category object.
 */
-void QLoggingRegistry::registerCategory(QLoggingCategory *cat)
+void QLoggingRegistry::registerCategory(QLoggingCategory *cat, QtMsgType enableForLevel)
 {
     QMutexLocker locker(&registryMutex);
 
     if (!categories.contains(cat)) {
-        categories.append(cat);
+        categories.insert(cat, enableForLevel);
         (*categoryFilter)(cat);
     }
 }
@@ -324,8 +323,7 @@ void QLoggingRegistry::registerCategory(QLoggingCategory *cat)
 void QLoggingRegistry::unregisterCategory(QLoggingCategory *cat)
 {
     QMutexLocker locker(&registryMutex);
-
-    categories.removeOne(cat);
+    categories.remove(cat);
 }
 
 /*!
@@ -341,7 +339,7 @@ void QLoggingRegistry::setApiRules(const QString &content)
     QMutexLocker locker(&registryMutex);
 
     if (qtLoggingDebug())
-        debugMsg("Loading logging rules set by Qt API ...");
+        debugMsg("Loading logging rules set by QLoggingCategory::setFilterRules ...");
 
     apiRules = parser.rules();
 
@@ -361,7 +359,7 @@ void QLoggingRegistry::updateRules()
 
     rules = configRules + apiRules + envRules;
 
-    foreach (QLoggingCategory *cat, categories)
+    foreach (QLoggingCategory *cat, categories.keys())
         (*categoryFilter)(cat);
 }
 
@@ -380,7 +378,7 @@ QLoggingRegistry::installFilter(QLoggingCategory::CategoryFilter filter)
     QLoggingCategory::CategoryFilter old = categoryFilter;
     categoryFilter = filter;
 
-    foreach (QLoggingCategory *cat, categories)
+    foreach (QLoggingCategory *cat, categories.keys())
         (*categoryFilter)(cat);
 
     return old;
@@ -397,18 +395,22 @@ QLoggingRegistry *QLoggingRegistry::instance()
 */
 void QLoggingRegistry::defaultCategoryFilter(QLoggingCategory *cat)
 {
-    // QLoggingCategory() normalizes "default" strings
-    // to qtDefaultCategoryName
-    bool debug = true;
+    QLoggingRegistry *reg = QLoggingRegistry::instance();
+    Q_ASSERT(reg->categories.contains(cat));
+    QtMsgType enableForLevel = reg->categories.value(cat);
+
+    bool debug = (enableForLevel == QtDebugMsg) ? true : false;
+    bool warning = (enableForLevel <= QtWarningMsg) ? true : false;
+    bool critical = (enableForLevel <= QtCriticalMsg) ? true : false;
+
+    // hard-wired implementation of
+    //   qt.*.debug=false
+    //   qt.debug=false
     char c;
     if (!memcmp(cat->categoryName(), "qt", 2) && (!(c = cat->categoryName()[2]) || c == '.'))
         debug = false;
 
-    bool warning = true;
-    bool critical = true;
-
     QString categoryName = QLatin1String(cat->categoryName());
-    QLoggingRegistry *reg = QLoggingRegistry::instance();
     foreach (const QLoggingRule &item, reg->rules) {
         int filterpass = item.pass(categoryName, QtDebugMsg);
         if (filterpass != 0)