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

Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2

4 files changed, 28 insertions, 25 deletions

diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro
index d70737a53f..11815c6160 100644
--- a/tests/auto/corelib/io/io.pro
+++ b/tests/auto/corelib/io/io.pro
@@ -38,6 +38,10 @@ SUBDIRS=\
         qwinoverlappedionotifier
 }
 
+!qtHaveModule(gui): SUBDIRS -= \
+    qdatastream \
+    qsettings
+
 !qtHaveModule(network): SUBDIRS -= \
     qfile \
     qiodevice \
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
index df93262d93..a49793c3d4 100644
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@@ -226,7 +226,7 @@ private slots:
     void QLoggingCategory_categoryName()
     {
         logMessage.clear();
-        QCOMPARE(QString::fromLatin1(QLoggingCategory::defaultCategory().categoryName()),
+        QCOMPARE(QString::fromLatin1(QLoggingCategory::defaultCategory()->categoryName()),
                  QStringLiteral("default"));
 
         QLoggingCategory defaultCategory("default");
@@ -237,7 +237,7 @@ private slots:
         QCOMPARE(QByteArray(nullCategory.categoryName()), QByteArray("default"));
 
         // we rely on the same pointer for any "default" category
-        QCOMPARE(QLoggingCategory::defaultCategory().categoryName(),
+        QCOMPARE(QLoggingCategory::defaultCategory()->categoryName(),
                  defaultCategory.categoryName());
         QCOMPARE(defaultCategory.categoryName(),
                  nullCategory.categoryName());
@@ -256,12 +256,12 @@ private slots:
     {
         logMessage.clear();
 
-        QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), true);
-        QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg), true);
-        QCOMPARE(QLoggingCategory::defaultCategory().isWarningEnabled(), true);
-        QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg), true);
-        QCOMPARE(QLoggingCategory::defaultCategory().isCriticalEnabled(), true);
-        QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtDebugMsg), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isWarningEnabled(), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtWarningMsg), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isCriticalEnabled(), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtCriticalMsg), true);
 
         QLoggingCategory defaultCategory("default");
         QCOMPARE(defaultCategory.isDebugEnabled(), true);
@@ -287,11 +287,11 @@ private slots:
     {
         logMessage.clear();
 
-        QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), true);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), true);
 
-        QLoggingCategory::defaultCategory().setEnabled(QtDebugMsg, false);
-        QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), false);
-        QLoggingCategory::defaultCategory().setEnabled(QtDebugMsg, true);
+        QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, false);
+        QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), false);
+        QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true);
 
         // make sure nothing has printed warnings
         QVERIFY(logMessage.isEmpty());
@@ -300,13 +300,13 @@ private slots:
 
     void QLoggingCategory_installFilter()
     {
-        QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled());
+        QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled());
 
         QLoggingCategory::CategoryFilter defaultFilter =
                 QLoggingCategory::installFilter(customCategoryFilter);
         QVERIFY(defaultFilter);
         customCategoryFilterArgs.clear();
-        QVERIFY(!QLoggingCategory::defaultCategory().isDebugEnabled());
+        QVERIFY(!QLoggingCategory::defaultCategory()->isDebugEnabled());
 
         QLoggingCategory cat("custom");
         QCOMPARE(customCategoryFilterArgs, QStringList() << "custom");
@@ -319,7 +319,7 @@ private slots:
         QCOMPARE((void*)currentFilter, (void*)customCategoryFilter);
         QCOMPARE(customCategoryFilterArgs.size(), 0);
 
-        QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled());
+        QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled());
         QVERIFY(!cat.isDebugEnabled());
 
         // install default filter
@@ -328,7 +328,7 @@ private slots:
         QCOMPARE((void*)defaultFilter, (void*)currentFilter);
         QCOMPARE(customCategoryFilterArgs.size(), 0);
 
-        QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled());
+        QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled());
         QVERIFY(!cat.isDebugEnabled());
     }
 
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index d9a0f51f3e..b020a50346 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -514,20 +514,20 @@ void tst_QSettings::ctor()
         QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp");
         if (format == QSettings::NativeFormat) {
 #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
-# ifdef Q_OS_MACX
+# ifdef Q_OS_OSX
             if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
                 QEXPECT_FAIL("native", "See QTBUG-32655", Continue);
-# endif // Q_OS_MACX
+# endif // Q_OS_OSX
             QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
 #else
             QVERIFY(!settings5.contains("key 1"));
 #endif
         } else {
 #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
-# ifdef Q_OS_MACX
+# ifdef Q_OS_OSX
             if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
                 QEXPECT_FAIL("", "See QTBUG-32655", Continue);
-# endif // Q_OS_MACX
+# endif // Q_OS_OSX
             QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
 #else
             QVERIFY(!settings5.contains("key 1"));
@@ -3183,7 +3183,7 @@ void tst_QSettings::rainersSyncBugOnMac()
 
     {
         QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP");
-#ifdef Q_OS_MACX
+#ifdef Q_OS_OSX
         if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
             QEXPECT_FAIL("native", "See QTBUG-32655", Continue);
 #endif
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index 75b17df759..d3a8bcfd13 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -964,8 +964,10 @@ void tst_QUrlInternal::encodingRecode_data()
     addUtf8Data("utf8-string-2", "\xDF\xBF\xE0\xA0\x80""A");
     addUtf8Data("utf8-string-3", "\xE0\xA0\x80\xDF\xBF...");
 
+    QTest::newRow("encode-unicode-noncharacter") << QString(QChar(0xffff)) << F(QUrl::FullyEncoded) << "%EF%BF%BF";
+    QTest::newRow("decode-unicode-noncharacter") << QString(QChar(0xffff)) << F(QUrl::PrettyDecoded) << QString::fromUtf8("\xEF\xBF\xBF");
+
     // special cases: stuff we can encode, but not decode
-    QTest::newRow("unicode-noncharacter") << QString(QChar(0xffff)) << F(QUrl::FullyEncoded) << "%EF%BF%BF";
     QTest::newRow("unicode-lo-surrogate") << QString(QChar(0xD800)) << F(QUrl::FullyEncoded) << "%ED%A0%80";
     QTest::newRow("unicode-hi-surrogate") << QString(QChar(0xDC00)) << F(QUrl::FullyEncoded) << "%ED%B0%80";
 
@@ -1011,9 +1013,6 @@ void tst_QUrlInternal::encodingRecodeInvalidUtf8_data()
     extern void loadInvalidUtf8Rows();
     loadInvalidUtf8Rows();
 
-    extern void loadNonCharactersRows();
-    loadNonCharactersRows();
-
     QTest::newRow("utf8-mix-4") << QByteArray("\xE0.A2\x80");
     QTest::newRow("utf8-mix-5") << QByteArray("\xE0\xA2.80");
     QTest::newRow("utf8-mix-6") << QByteArray("\xE0\xA2\x33");