Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/network/access/qhttpthreaddelegate.cpp

Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91

2 files changed, 6 insertions, 6 deletions

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();