1 files changed, 11 insertions, 5 deletions
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h
index 69fc6ea4ec..a68b993cca 100644
--- a/src/corelib/io/qloggingregistry_p.h
+++ b/src/corelib/io/qloggingregistry_p.h
@@ -130,14 +130,20 @@ private:
 
     static void defaultCategoryFilter(QLoggingCategory *category);
 
+    enum RuleSet {
+        // sorted by order in which defaultCategoryFilter considers them:
+        QtConfigRules,
+        ConfigRules,
+        ApiRules,
+        EnvironmentRules,
+
+        NumRuleSets
+    };
+
     QMutex registryMutex;
 
     // protected by mutex:
-    QVector<QLoggingRule> qtConfigRules;
-    QVector<QLoggingRule> configRules;
-    QVector<QLoggingRule> envRules;
-    QVector<QLoggingRule> apiRules;
-    QVector<QLoggingRule> rules;
+    QVector<QLoggingRule> ruleSets[NumRuleSets];
     QHash<QLoggingCategory*,QtMsgType> categories;
     QLoggingCategory::CategoryFilter categoryFilter;