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

Change-Id: I6f8d3abd3247dc980dc7834801a017a89c8f4286

8 files changed, 151 insertions, 35 deletions

diff --git a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
index 7043969c2f..2345bb39c1 100644
--- a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
+++ b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
@@ -64,6 +64,9 @@ struct TestData
     quint16 data16;
     quint8 data8;
 
+    float dataFloat;
+    double dataDouble;
+
     quint8 reserved;
 };
 
@@ -72,6 +75,7 @@ template <> quint8 getData(const TestData &d) { return d.data8; }
 template <> quint16 getData(const TestData &d) { return d.data16; }
 template <> quint32 getData(const TestData &d) { return d.data32; }
 template <> quint64 getData(const TestData &d) { return d.data64; }
+template <> float getData(const TestData &d) { return d.dataFloat; }
 
 union RawTestData
 {
@@ -79,9 +83,39 @@ union RawTestData
     TestData data;
 };
 
-static const TestData inNativeEndian = { Q_UINT64_C(0x0123456789abcdef), 0x00c0ffee, 0xcafe, 0xcf, '\0' };
-static const RawTestData inBigEndian = { "\x01\x23\x45\x67\x89\xab\xcd\xef" "\x00\xc0\xff\xee" "\xca\xfe" "\xcf" };
-static const RawTestData inLittleEndian = { "\xef\xcd\xab\x89\x67\x45\x23\x01" "\xee\xff\xc0\x00" "\xfe\xca" "\xcf" };
+template <typename Float>
+Float int2Float(typename QIntegerForSizeof<Float>::Unsigned i)
+{
+    Float result = 0;
+    memcpy(reinterpret_cast<char *>(&result), reinterpret_cast<const char *>(&i), sizeof (Float));
+    return result;
+}
+
+static const TestData inNativeEndian = {
+    Q_UINT64_C(0x0123456789abcdef),
+    0x00c0ffee,
+    0xcafe,
+    0xcf,
+    int2Float<float>(0x00c0ffeeU),
+    int2Float<double>(Q_UINT64_C(0x0123456789abcdef)),
+    '\0'
+};
+static const RawTestData inBigEndian = {
+    "\x01\x23\x45\x67\x89\xab\xcd\xef"
+    "\x00\xc0\xff\xee"
+    "\xca\xfe"
+    "\xcf"
+    "\x00\xc0\xff\xee"
+    "\x01\x23\x45\x67\x89\xab\xcd\xef"
+};
+static const RawTestData inLittleEndian = {
+    "\xef\xcd\xab\x89\x67\x45\x23\x01"
+    "\xee\xff\xc0\x00"
+    "\xfe\xca"
+    "\xcf"
+    "\xee\xff\xc0\x00"
+    "\xef\xcd\xab\x89\x67\x45\x23\x01"
+};
 
 #define EXPAND_ENDIAN_TEST(endian)          \
     do {                                    \
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index fed05698fd..da5327594c 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -209,9 +209,6 @@ void tst_QIODevice::read_QByteArray()
 //--------------------------------------------------------------------
 void tst_QIODevice::unget()
 {
-#if defined(Q_OS_MAC)
-    QSKIP("The unget network test is unstable on Mac. See QTBUG-39983.");
-#endif
     QBuffer buffer;
     buffer.open(QBuffer::ReadWrite);
     buffer.write("ZXCV");
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST b/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST
index fb7e025b7c..b1590a5ccf 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST
+++ b/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST
@@ -1,7 +1,5 @@
 [sendPostedEvents]
 windows
-osx
 [registerTimer]
 windows
-osx
 winrt
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 9f4419affc..936cbd3894 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -103,6 +103,7 @@ private slots:
     void deleteQObjectWhenDeletingEvent();
     void overloads();
     void isSignalConnected();
+    void isSignalConnectedAfterDisconnection();
     void qMetaObjectConnect();
     void qMetaObjectDisconnectOne();
     void sameName();
@@ -3837,6 +3838,58 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!o.isSignalConnected(QMetaMethod()));
 }
 
+void tst_QObject::isSignalConnectedAfterDisconnection()
+{
+    ManySignals o;
+    const QMetaObject *meta = o.metaObject();
+
+    const QMetaMethod sig00 = meta->method(meta->indexOfSignal("sig00()"));
+    QVERIFY(!o.isSignalConnected(sig00));
+    QObject::connect(&o, &ManySignals::sig00, qt_noop);
+    QVERIFY(o.isSignalConnected(sig00));
+    QVERIFY(QObject::disconnect(&o, &ManySignals::sig00, 0, 0));
+    QVERIFY(!o.isSignalConnected(sig00));
+
+    const QMetaMethod sig69 = meta->method(meta->indexOfSignal("sig69()"));
+    QVERIFY(!o.isSignalConnected(sig69));
+    QObject::connect(&o, &ManySignals::sig69, qt_noop);
+    QVERIFY(o.isSignalConnected(sig69));
+    QVERIFY(QObject::disconnect(&o, &ManySignals::sig69, 0, 0));
+    QVERIFY(!o.isSignalConnected(sig69));
+
+    {
+        ManySignals o2;
+        QObject::connect(&o, &ManySignals::sig00, &o2, &ManySignals::sig00);
+        QVERIFY(o.isSignalConnected(sig00));
+        // o2 is destructed
+    }
+    QVERIFY(!o.isSignalConnected(sig00));
+
+    const QMetaMethod sig01 = meta->method(meta->indexOfSignal("sig01()"));
+    QObject::connect(&o, &ManySignals::sig00, qt_noop);
+    QObject::connect(&o, &ManySignals::sig01, qt_noop);
+    QObject::connect(&o, &ManySignals::sig69, qt_noop);
+    QVERIFY(o.isSignalConnected(sig00));
+    QVERIFY(o.isSignalConnected(sig01));
+    QVERIFY(o.isSignalConnected(sig69));
+    QVERIFY(QObject::disconnect(&o, &ManySignals::sig69, 0, 0));
+    QVERIFY(o.isSignalConnected(sig00));
+    QVERIFY(o.isSignalConnected(sig01));
+    QVERIFY(!o.isSignalConnected(sig69));
+    QVERIFY(QObject::disconnect(&o, &ManySignals::sig00, 0, 0));
+    QVERIFY(!o.isSignalConnected(sig00));
+    QVERIFY(o.isSignalConnected(sig01));
+    QVERIFY(!o.isSignalConnected(sig69));
+    QObject::connect(&o, &ManySignals::sig69, qt_noop);
+    QVERIFY(!o.isSignalConnected(sig00));
+    QVERIFY(o.isSignalConnected(sig01));
+    QVERIFY(o.isSignalConnected(sig69));
+    QVERIFY(QObject::disconnect(&o, &ManySignals::sig01, 0, 0));
+    QVERIFY(!o.isSignalConnected(sig00));
+    QVERIFY(!o.isSignalConnected(sig01));
+    QVERIFY(o.isSignalConnected(sig69));
+}
+
 void tst_QObject::qMetaObjectConnect()
 {
     ReceiverObject r1;
diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
index 1b818ad152..c609aa6621 100644
--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
@@ -334,7 +334,7 @@ void tst_QCborValue::copyCompare()
     QCOMPARE(v, other);
     QVERIFY(!(v != other));
     QVERIFY(!(v < other));
-#if QT_HAS_INCLUDE(<compare>)
+#if 0 && QT_HAS_INCLUDE(<compare>)
     QVERIFY(v <= other);
     QVERIFY(v >= other);
     QVERIFY(!(v > other));
diff --git a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
index f520e9742a..18098f16bf 100644
--- a/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
@@ -2108,12 +2108,16 @@ void tst_QRegularExpression::threadSafety_data()
         QTest::addRow("pattern%d", ++i) << "ab.*cd" << subject;
     }
 
+    // pcre2 does not support JIT for winrt. As this test row takes a long time without JIT we skip
+    // it for winrt as it might time out in COIN.
+#ifndef Q_OS_WINRT
     {
         QString subject = "ab";
         subject.append(QString(512*1024, QLatin1Char('x')));
         subject.append("c");
         QTest::addRow("pattern%d", ++i) << "ab.*cd" << subject;
     }
+#endif // Q_OS_WINRT
 
     {
         QString subject = "ab";
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 779d55a77a..45ab275510 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -962,9 +962,6 @@ void tst_QLocalSocket::processConnection()
 #if !QT_CONFIG(process)
     QSKIP("No qprocess support", SkipAll);
 #else
-#ifdef Q_OS_MAC
-    QSKIP("The processConnection test is unstable on Mac. See QTBUG-39986.");
-#endif
 
 #ifdef Q_OS_WIN
     const QString exeSuffix = QStringLiteral(".exe");
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index d8a680881a..9ee5292fcb 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -51,10 +51,15 @@
 
 // Will try to wait for the condition while allowing event processing
 // for a maximum of 5 seconds.
-#define TRY_WAIT(expr) \
+#define TRY_WAIT(expr, timedOut) \
     do { \
+        *timedOut = true; \
         const int step = 50; \
-        for (int __i = 0; __i < 5000 && !(expr); __i+=step) { \
+        for (int __i = 0; __i < 5000; __i += step) { \
+            if (expr) { \
+                *timedOut = false; \
+                break; \
+            } \
             QTest::qWait(step); \
         } \
     } while(0)
@@ -123,6 +128,8 @@ private slots:
 
 protected:
     bool createFiles(const QString &test_path, const QStringList &initial_files, int existingFileCount = 0, const QStringList &intial_dirs = QStringList());
+    QModelIndex prepareTestModelRoot(const QString &test_path, QSignalSpy **spy2 = nullptr,
+                                     QSignalSpy **spy3 = nullptr);
 
 private:
     QFileSystemModel *model;
@@ -306,7 +313,11 @@ void tst_QFileSystemModel::iconProvider()
 bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringList &initial_files, int existingFileCount, const QStringList &initial_dirs)
 {
     //qDebug() << (model->rowCount(model->index(test_path))) << existingFileCount << initial_files;
-    TRY_WAIT((model->rowCount(model->index(test_path)) == existingFileCount));
+    bool timedOut = false;
+    TRY_WAIT((model->rowCount(model->index(test_path)) == existingFileCount), &timedOut);
+    if (timedOut)
+        return false;
+
     for (int i = 0; i < initial_dirs.count(); ++i) {
         QDir dir(test_path);
         if (!dir.exists()) {
@@ -363,23 +374,45 @@ bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringLi
     return true;
 }
 
-void tst_QFileSystemModel::rowCount()
+QModelIndex tst_QFileSystemModel::prepareTestModelRoot(const QString &test_path, QSignalSpy **spy2,
+                                                       QSignalSpy **spy3)
 {
-    QString tmp = flatDirTestPath;
-    QVERIFY(createFiles(tmp, QStringList()));
+    if (model->rowCount(model->index(test_path)) != 0)
+        return QModelIndex();
 
-    QSignalSpy spy2(model, SIGNAL(rowsInserted(QModelIndex,int,int)));
-    QSignalSpy spy3(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
+    if (spy2)
+        *spy2 = new QSignalSpy(model, &QFileSystemModel::rowsInserted);
+    if (spy3)
+        *spy3 = new QSignalSpy(model, &QFileSystemModel::rowsAboutToBeInserted);
 
-    QStringList files = QStringList() <<  "b" << "d" << "f" << "h" << "j" << ".a" << ".c" << ".e" << ".g";
+    QStringList files = { "b", "d", "f", "h", "j", ".a", ".c", ".e", ".g" };
     QString l = "b,d,f,h,j,.a,.c,.e,.g";
 
-    QVERIFY(createFiles(tmp, files));
+    if (!createFiles(test_path, files))
+        return QModelIndex();
 
-    QModelIndex root = model->setRootPath(tmp);
-    QTRY_COMPARE(model->rowCount(root), 5);
-    QVERIFY(spy2.count() > 0);
-    QVERIFY(spy3.count() > 0);
+    QModelIndex root = model->setRootPath(test_path);
+    if (!root.isValid())
+        return QModelIndex();
+
+    bool timedOut = false;
+    TRY_WAIT(model->rowCount(root) == 5, &timedOut);
+    if (timedOut)
+        return QModelIndex();
+
+    return root;
+}
+
+void tst_QFileSystemModel::rowCount()
+{
+    const QString tmp = flatDirTestPath;
+    QSignalSpy *spy2 = nullptr;
+    QSignalSpy *spy3 = nullptr;
+    QModelIndex root = prepareTestModelRoot(flatDirTestPath, &spy2, &spy3);
+    QVERIFY(root.isValid());
+
+    QVERIFY(spy2 && spy2->count() > 0);
+    QVERIFY(spy3 && spy3->count() > 0);
 }
 
 void tst_QFileSystemModel::rowsInserted_data()
@@ -401,9 +434,9 @@ static inline QString lastEntry(const QModelIndex &root)
 
 void tst_QFileSystemModel::rowsInserted()
 {
-    QString tmp = flatDirTestPath;
-    rowCount();
-    QModelIndex root = model->index(model->rootPath());
+    const QString tmp = flatDirTestPath;
+    QModelIndex root = prepareTestModelRoot(tmp);
+    QVERIFY(root.isValid());
 
     QFETCH(int, ascending);
     QFETCH(int, count);
@@ -454,9 +487,9 @@ void tst_QFileSystemModel::rowsRemoved_data()
 
 void tst_QFileSystemModel::rowsRemoved()
 {
-    QString tmp = flatDirTestPath;
-    rowCount();
-    QModelIndex root = model->index(model->rootPath());
+    const QString tmp = flatDirTestPath;
+    QModelIndex root = prepareTestModelRoot(tmp);
+    QVERIFY(root.isValid());
 
     QFETCH(int, count);
     QFETCH(int, ascending);
@@ -509,9 +542,9 @@ void tst_QFileSystemModel::dataChanged()
 {
     QSKIP("This can't be tested right now since we don't watch files, only directories.");
 
-    QString tmp = flatDirTestPath;
-    rowCount();
-    QModelIndex root = model->index(model->rootPath());
+    const QString tmp = flatDirTestPath;
+    QModelIndex root = prepareTestModelRoot(tmp);
+    QVERIFY(root.isValid());
 
     QFETCH(int, count);
     QFETCH(int, assending);