Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 5357194406..8b69518ef7 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -187,6 +187,7 @@ private slots:
     void bom();
     void embeddedZeroByte_data();
     void embeddedZeroByte();
+    void spaceAfterComment();
 
     void testXdg();
 private:
@@ -764,6 +765,34 @@ void tst_QSettings::embeddedZeroByte()
     }
 }
 
+void tst_QSettings::spaceAfterComment()
+{
+    QSettings settings(QFINDTESTDATA("withcomments.ini"), QSettings::IniFormat);
+    QCOMPARE(settings.status(), QSettings::NoError);
+
+    QStringList groups = settings.childGroups();
+    QVERIFY(groups.contains("Regular"));
+    QVERIFY(groups.contains("WithSpaces"));
+    QVERIFY(groups.contains("WithTab"));
+    QVERIFY(groups.contains("SpacedGroup"));
+
+    settings.beginGroup("Regular");
+    QCOMPARE(settings.value("bar"), QVariant(2));
+    settings.endGroup();
+
+    settings.beginGroup("WithSpaces");
+    QCOMPARE(settings.value("bar"), QVariant(4));
+    settings.endGroup();
+
+    settings.beginGroup("WithTab");
+    QCOMPARE(settings.value("bar"), QVariant(6));
+    settings.endGroup();
+
+    settings.beginGroup("SpacedGroup");
+    QCOMPARE(settings.value("bar"), QVariant(7));
+    settings.endGroup();
+}
+
 void tst_QSettings::testErrorHandling_data()
 {
     QTest::addColumn<int>("filePerms"); // -1 means file should not exist