diff options
Diffstat (limited to 'src/corelib/io/qloggingregistry_p.h')
| -rw-r--r-- | src/corelib/io/qloggingregistry_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index 48804cfc2b..ce2503b32c 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -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. @@ -113,7 +113,7 @@ public: void init(); - void registerCategory(QLoggingCategory *category); + void registerCategory(QLoggingCategory *category, QtMsgType enableForLevel); void unregisterCategory(QLoggingCategory *category); void setApiRules(const QString &content); @@ -134,7 +134,7 @@ private: QVector<QLoggingRule> envRules; QVector<QLoggingRule> apiRules; QVector<QLoggingRule> rules; - QList<QLoggingCategory*> categories; + QHash<QLoggingCategory*,QtMsgType> categories; QLoggingCategory::CategoryFilter categoryFilter; friend class ::tst_QLoggingRegistry; |