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

Change-Id: I2bd2e61bae1eab4fc74fa6accd741ed9ae1f0669

5 files changed, 47 insertions, 13 deletions

diff --git a/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
new file mode 100644
index 0000000000..f6a49f032c
--- /dev/null
+++ b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
@@ -0,0 +1,2 @@
+[elapsed]
+windows
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index 42fed1191b..16177bb0b7 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -302,15 +302,10 @@ void tst_QLibrary::isLibrary_data()
     QTest::newRow(".sl") << QString("mylib.sl") << sl_VALID;
     QTest::newRow(".so") << QString("mylib.so") << so_VALID;
     QTest::newRow(".so+version") << QString("mylib.so.0") << so_VALID;
-
-    // special tests:
-#ifndef Q_OS_MAC
     QTest::newRow("version+.so") << QString("libc-2.7.so") << so_VALID;
     QTest::newRow("version+.so+version") << QString("liboil-0.3.so.0.1.0") << so_VALID;
-#else
-    QTest::newRow("version+.so") << QString("libc-2.7.so") << false;
-    QTest::newRow("version+.so+version") << QString("liboil-0.3.so.0.1.0") << false;
-#endif
+
+    // special tests:
 #ifdef Q_OS_MAC
     QTest::newRow("good (libmylib.1.0.0.dylib)") << QString("libmylib.1.0.0.dylib") << true;
     QTest::newRow("good (libmylib.dylib)") << QString("libmylib.dylib") << true;
diff --git a/tests/auto/corelib/thread/qwaitcondition/BLACKLIST b/tests/auto/corelib/thread/qwaitcondition/BLACKLIST
new file mode 100644
index 0000000000..3ff336576b
--- /dev/null
+++ b/tests/auto/corelib/thread/qwaitcondition/BLACKLIST
@@ -0,0 +1,2 @@
+[wakeOne]
+windows
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index d8239b5a28..c324a4bd56 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -757,13 +757,14 @@ void tst_QFormLayout::removeRow()
 
     layout->removeRow(1);
 
-    QVERIFY(!w1);
-    QCOMPARE(layout->count(), 1);
+    QVERIFY(w1);
+    QVERIFY(!w2);
+    QCOMPARE(layout->count(), 2);
     QCOMPARE(layout->rowCount(), 1);
 
     layout->removeRow(0);
 
-    QVERIFY(!w2);
+    QVERIFY(!w1);
     QCOMPARE(layout->count(), 0);
     QCOMPARE(layout->rowCount(), 0);
 }
@@ -863,17 +864,19 @@ void tst_QFormLayout::takeRow()
 
     QVERIFY(w2);
     QVERIFY(result.fieldItem);
-    QVERIFY(result.labelItem);
-    QCOMPARE(layout->count(), 1);
+    QVERIFY(!result.labelItem);
+    QCOMPARE(layout->count(), 2);
     QCOMPARE(layout->rowCount(), 1);
+    QCOMPARE(result.fieldItem->widget(), w2.data());
 
     result = layout->takeRow(0);
 
     QVERIFY(w1);
     QVERIFY(result.fieldItem);
-    QVERIFY(!result.labelItem);
+    QVERIFY(result.labelItem);
     QCOMPARE(layout->count(), 0);
     QCOMPARE(layout->rowCount(), 0);
+    QCOMPARE(result.fieldItem->widget(), w1.data());
 
     result = layout->takeRow(0);
 
diff --git a/tests/benchmarks/corelib/io/qiodevice/main.cpp b/tests/benchmarks/corelib/io/qiodevice/main.cpp
index b106a9fd3d..de4660a253 100644
--- a/tests/benchmarks/corelib/io/qiodevice/main.cpp
+++ b/tests/benchmarks/corelib/io/qiodevice/main.cpp
@@ -39,6 +39,8 @@ class tst_qiodevice : public QObject
 private slots:
     void read_old();
     void read_old_data() { read_data(); }
+    void peekAndRead();
+    void peekAndRead_data() { read_data(); }
     //void read_new();
     //void read_new_data() { read_data(); }
 private:
@@ -86,6 +88,36 @@ void tst_qiodevice::read_old()
     }
 }
 
+void tst_qiodevice::peekAndRead()
+{
+    QFETCH(qint64, size);
+
+    QString name = "tmp" + QString::number(size);
+
+    {
+        QFile file(name);
+        file.open(QIODevice::WriteOnly);
+        file.seek(size);
+        file.write("x", 1);
+        file.close();
+    }
+
+    QBENCHMARK {
+        QFile file(name);
+        file.open(QIODevice::ReadOnly);
+
+        QByteArray ba(size / 1024, Qt::Uninitialized);
+        while (!file.atEnd()) {
+            file.peek(ba.data(), ba.size());
+            file.read(ba.data(), ba.size());
+        }
+    }
+
+    {
+        QFile file(name);
+        file.remove();
+    }
+}
 
 QTEST_MAIN(tst_qiodevice)