Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: Ia8ac1960387c0f78c32f9d0385bb0aa9a8209af1

3 files changed, 68 insertions, 13 deletions

diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
index 3ec863302e..9bd87e3f21 100644
--- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
+++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
@@ -44,6 +44,8 @@ private slots:
     void float_cast();
     void float_cast_data();
     void promotionTests();
+    void arithOps_data();
+    void arithOps();
 };
 
 void tst_qfloat16::fuzzyCompare_data()
@@ -198,8 +200,12 @@ void tst_qfloat16::float_cast()
 {
     QFETCH(float, val);
 
-    QVERIFY(qFuzzyCompare(float(qfloat16(val)),val));
-    QVERIFY(qFuzzyCompare(float(qfloat16(-val)),-val));
+    QVERIFY(qFuzzyCompare((float)(qfloat16(val)),val));
+    QVERIFY(qFuzzyCompare((float)(qfloat16(-val)),-val));
+    QVERIFY(qFuzzyCompare((double)(qfloat16(val)),(double)(val)));
+    QVERIFY(qFuzzyCompare((double)(qfloat16(-val)),(double)(-val)));
+    //QVERIFY(qFuzzyCompare((long double)(qfloat16(val)),(long double)(val)));
+    //QVERIFY(qFuzzyCompare((long double)(qfloat16(-val)),(long double)(-val)));
 }
 
 void tst_qfloat16::promotionTests()
@@ -248,6 +254,55 @@ void tst_qfloat16::promotionTests()
     QCOMPARE(sizeof(double),sizeof(qfloat16(1.f)-1));
     QCOMPARE(sizeof(double),sizeof(qfloat16(1.f)*1));
     QCOMPARE(sizeof(double),sizeof(qfloat16(1.f)/1));
+
+    QCOMPARE(QString::number(1.f),QString::number(qfloat16(1.f)));
+}
+
+void tst_qfloat16::arithOps_data()
+{
+    QTest::addColumn<float>("val1");
+    QTest::addColumn<float>("val2");
+
+    QTest::newRow("zero")  << 0.0f << 2.0f;
+    QTest::newRow("one")   << 1.0f << 4.0f;
+    QTest::newRow("ten")   << 10.0f << 20.0f;
+}
+
+void tst_qfloat16::arithOps()
+{
+    QFETCH(float, val1);
+    QFETCH(float, val2);
+
+    QVERIFY(qFuzzyCompare(float(qfloat16(val1) + qfloat16(val2)), val1 + val2));
+    QVERIFY(qFuzzyCompare(float(qfloat16(val1) - qfloat16(val2)), val1 - val2));
+    QVERIFY(qFuzzyCompare(float(qfloat16(val1) * qfloat16(val2)), val1 * val2));
+    QVERIFY(qFuzzyCompare(float(qfloat16(val1) / qfloat16(val2)), val1 / val2));
+
+    QVERIFY(qFuzzyCompare(qfloat16(val1) + val2, val1 + val2));
+    QVERIFY(qFuzzyCompare(qfloat16(val1) - val2, val1 - val2));
+    QVERIFY(qFuzzyCompare(qfloat16(val1) * val2, val1 * val2));
+    QVERIFY(qFuzzyCompare(qfloat16(val1) / val2, val1 / val2));
+
+    QVERIFY(qFuzzyCompare(val1 + qfloat16(val2), val1 + val2));
+    QVERIFY(qFuzzyCompare(val1 - qfloat16(val2), val1 - val2));
+    QVERIFY(qFuzzyCompare(val1 * qfloat16(val2), val1 * val2));
+    QVERIFY(qFuzzyCompare(val1 / qfloat16(val2), val1 / val2));
+
+    float r1 = 0.f;
+    r1 += qfloat16(val2);
+    QVERIFY(qFuzzyCompare(r1,val2));
+
+    float r2 = 0.f;
+    r2 -= qfloat16(val2);
+    QVERIFY(qFuzzyCompare(r2,-val2));
+
+    float r3 = 1.f;
+    r3 *= qfloat16(val2);
+    QVERIFY(qFuzzyCompare(r3,val2));
+
+    float r4 = 1.f;
+    r4 /= qfloat16(val2);
+    QVERIFY(qFuzzyCompare(r4,1.f/val2));
 }
 
 QTEST_APPLESS_MAIN(tst_qfloat16)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 280e3f77a4..8a46bc1c55 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -72,12 +72,12 @@ static inline QString testSuiteWarning()
     str << "\nCannot find the shared-mime-info test suite\nstarting from: "
         << QDir::toNativeSeparators(QDir::currentPath()) << "\n"
            "cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n"
-           "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-0.zip\n"
-           "unzip Release-1-0.zip\n";
+           "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-8.zip\n"
+           "unzip Release-1-8.zip\n";
 #ifdef Q_OS_WIN
-    str << "mkdir testfiles\nxcopy /s Release-1-0\\tests testfiles\n";
+    str << "mkdir testfiles\nxcopy /s Release-1-8 s-m-i\n";
 #else
-    str << "ln -s Release-1-0/tests testfiles\n";
+    str << "ln -s Release-1-8 s-m-i\n";
 #endif
     return result;
 }
@@ -154,7 +154,7 @@ void tst_QMimeDatabase::initTestCase()
     QVERIFY2(copyResourceFile(xmlFileName, xmlTargetFileName, &errorMessage), qPrintable(errorMessage));
 #endif
 
-    m_testSuite = QFINDTESTDATA("testfiles");
+    m_testSuite = QFINDTESTDATA("s-m-i/tests");
     if (m_testSuite.isEmpty())
         qWarning("%s", qPrintable(testSuiteWarning()));
 
@@ -438,7 +438,7 @@ void tst_QMimeDatabase::icons()
     QMimeType directory = db.mimeTypeForFile(QString::fromLatin1("/"));
     QCOMPARE(directory.name(), QString::fromLatin1("inode/directory"));
     QCOMPARE(directory.iconName(), QString::fromLatin1("inode-directory"));
-    QCOMPARE(directory.genericIconName(), QString::fromLatin1("inode-x-generic"));
+    QCOMPARE(directory.genericIconName(), QString::fromLatin1("folder"));
 
     QMimeType pub = db.mimeTypeForFile(QString::fromLatin1("foo.epub"), QMimeDatabase::MatchExtension);
     QCOMPARE(pub.name(), QString::fromLatin1("application/epub+zip"));
@@ -510,7 +510,7 @@ void tst_QMimeDatabase::mimeTypeForFileWithContent()
         mime = db.mimeTypeForFile(txtTempFileName);
         QCOMPARE(mime.name(), QString::fromLatin1("text/plain"));
         mime = db.mimeTypeForFile(txtTempFileName, QMimeDatabase::MatchContent);
-        QCOMPARE(mime.name(), QString::fromLatin1("application/smil"));
+        QCOMPARE(mime.name(), QString::fromLatin1("application/smil+xml"));
     }
 
     // Test what happens with an incorrect path
@@ -607,7 +607,7 @@ void tst_QMimeDatabase::allMimeTypes()
     QVERIFY(!lst.isEmpty());
 
     // Hardcoding this is the only way to check both providers find the same number of mimetypes.
-    QCOMPARE(lst.count(), 661);
+    QCOMPARE(lst.count(), 749);
 
     foreach (const QMimeType &mime, lst) {
         const QString name = mime.name();
@@ -802,7 +802,7 @@ void tst_QMimeDatabase::findByData()
         // Expected to fail
         QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName));
     } else {
-        QCOMPARE(resultMimeTypeName, mimeTypeName);
+        QCOMPARE(resultMimeTypeName.toLower(), mimeTypeName.toLower());
     }
 
     QFileInfo info(filePath);
@@ -833,7 +833,7 @@ void tst_QMimeDatabase::findByFile()
         // Expected to fail
         QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName));
     } else {
-        QCOMPARE(resultMimeTypeName, mimeTypeName);
+        QCOMPARE(resultMimeTypeName.toLower(), mimeTypeName.toLower());
     }
 
     // Test QFileInfo overload
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 540f317935..c21223886a 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -398,7 +398,7 @@ void tst_QSqlThread::readWriteThreading()
     producer.start();
     consumer.start();
 
-    QTRY_VERIFY(threadFinishedCount >= 2);
+    QTRY_VERIFY_WITH_TIMEOUT(threadFinishedCount >= 2, 10000);
 }
 
 // run with n threads in parallel. Change this constant to hammer the poor DB server even more