2 files changed, 26 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 9cae582143..7e04fa5957 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -112,9 +112,11 @@ void tst_QFileSystemWatcher::basicTest_data()
         + QChar(ushort(0x00DC)) // LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS
         + QStringLiteral(".txt");
 
+#if !defined(Q_OS_QNX) || !defined(QT_NO_INOTIFY)
     QTest::newRow("native backend-testfile") << "native" << testFile;
-    QTest::newRow("poller backend-testfile") << "poller" << testFile;
     QTest::newRow("native backend-specialchars") << "native" << specialCharacterFile;
+#endif
+    QTest::newRow("poller backend-testfile") << "poller" << testFile;
 }
 
 void tst_QFileSystemWatcher::basicTest()
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 501ad6f415..2c9868cd10 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -166,6 +166,7 @@ private slots:
 
     void testByteArray_data();
     void testByteArray();
+    void iniCodec();
 
 private:
     const bool m_canWriteNativeSystemSettings;
@@ -695,6 +696,28 @@ void tst_QSettings::testByteArray()
     }
 }
 
+void tst_QSettings::iniCodec()
+{
+    {
+        QSettings settings("QtProject", "tst_qsettings");
+        settings.setIniCodec("cp1251");
+        QByteArray ba;
+        ba.resize(256);
+        for (int i = 0; i < ba.size(); i++)
+            ba[i] = i;
+        settings.setValue("array",ba);
+    }
+    {
+        QSettings settings("QtProject", "tst_qsettings");
+        settings.setIniCodec("cp1251");
+        QByteArray ba = settings.value("array").toByteArray();
+        QCOMPARE(ba.size(), 256);
+        for (int i = 0; i < ba.size(); i++)
+            QCOMPARE((uchar)ba.at(i), (uchar)i);
+    }
+
+}
+
 void tst_QSettings::testErrorHandling_data()
 {
     QTest::addColumn<int>("filePerms"); // -1 means file should not exist