summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qloggingcategory.cpp2
-rw-r--r--src/corelib/io/qloggingregistry.cpp4
-rw-r--r--tests/auto/corelib/io/qloggingregistry/qtlogging.ini2
-rw-r--r--tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp10
4 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index f37b9575aa..eb8aeaca50 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -109,7 +109,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QLoggingCategory, qtDefaultCategory,
apply to a category/type, the rule that comes later is applied.
Rules can be set via \l setFilterRules(). Since Qt 5.3 logging rules
- are also automatically loaded from the \c [rules] section of a logging
+ are also automatically loaded from the \c [Rules] section of a logging
configuration file. Such configuration files are looked up in the QtProject
configuration directory, or explicitly set in a \c QT_LOGGING_CONF
environment variable.
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index b8fef16c0e..2619743ff4 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -203,7 +203,7 @@ void QLoggingSettingsParser::setContent(QTextStream &stream)
continue;
}
- if (_section == QLatin1String("rules")) {
+ if (_section == QLatin1String("Rules")) {
int equalPos = line.indexOf(QLatin1Char('='));
if ((equalPos != -1)
&& (line.lastIndexOf(QLatin1Char('=')) == equalPos)) {
@@ -298,7 +298,7 @@ void QLoggingRegistry::unregisterCategory(QLoggingCategory *cat)
void QLoggingRegistry::setApiRules(const QString &content)
{
QLoggingSettingsParser parser;
- parser.setSection(QStringLiteral("rules"));
+ parser.setSection(QStringLiteral("Rules"));
parser.setContent(content);
QMutexLocker locker(&registryMutex);
diff --git a/tests/auto/corelib/io/qloggingregistry/qtlogging.ini b/tests/auto/corelib/io/qloggingregistry/qtlogging.ini
index 63b384e36a..fd7a4f8c54 100644
--- a/tests/auto/corelib/io/qloggingregistry/qtlogging.ini
+++ b/tests/auto/corelib/io/qloggingregistry/qtlogging.ini
@@ -1,2 +1,2 @@
-[rules]
+[Rules]
*=true
diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index b538525161..dc6f16828b 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -63,16 +63,16 @@ private slots:
{
//
// Logging configuration can be described
- // in an .ini file. [rules] is the
+ // in an .ini file. [Rules] is the
// default category, and optional ...
//
QLoggingSettingsParser parser;
- parser.setContent("[rules]\n"
+ parser.setContent("[Rules]\n"
"default=false\n"
"default=true");
QCOMPARE(parser.rules().size(), 2);
- parser.setContent("[rules]\n"
+ parser.setContent("[Rules]\n"
"default=false");
QCOMPARE(parser.rules().size(), 1);
@@ -115,7 +115,7 @@ private slots:
QFile file(dir.absoluteFilePath("qtlogging.ini"));
QVERIFY(file.open(QFile::WriteOnly | QFile::Text));
QTextStream out(&file);
- out << "[rules]\n";
+ out << "[Rules]\n";
out << "Digia.*=false\n";
file.close();
@@ -153,7 +153,7 @@ private slots:
// set Config rule
QLoggingSettingsParser parser;
- parser.setContent("[rules]\nDigia.*=false");
+ parser.setContent("[Rules]\nDigia.*=false");
registry->configRules=parser.rules();
registry->updateRules();