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

 Conflicts:
	config.tests/arch/write_info.pri
		Repair architecture config test for the WASM_OBJECT_FILES=1 build mode
	configure.pri
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp

Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I9e12088356eb5bc65b53211cd7a8e330cccd1bb4

5 files changed, 97 insertions, 11 deletions

diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index d19eac7530..9a7c099228 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -84,6 +84,8 @@ private slots:
     void operator_noteq();
 
     void resize();
+    void fromBits_data();
+    void fromBits();
 };
 
 void tst_QBitArray::size_data()
@@ -610,5 +612,60 @@ void tst_QBitArray::resize()
 
 }
 
+void tst_QBitArray::fromBits_data()
+{
+    QTest::addColumn<QByteArray>("data");
+    QTest::addColumn<int>("size");
+    QTest::addColumn<QBitArray>("expected");
+
+    QTest::newRow("empty") << QByteArray() << 0 << QBitArray();
+
+    auto add = [](const QByteArray &tag, const char *data) {
+        QTest::newRow(tag) << QByteArray(data, (tag.size() + 7) / 8) << tag.size()
+                           << QStringToQBitArray(tag);
+    };
+
+    // "0" to "0000000000000000"
+    for (int i = 1; i < 16; ++i) {
+        char zero[2] = { 0, 0 };
+        QByteArray pattern(i, '0');
+        add(pattern, zero);
+    }
+
+    // "1" to "1111111111111111"
+    for (int i = 1; i < 16; ++i) {
+        char one[2] = { '\xff', '\xff' };
+        QByteArray pattern(i, '1');
+        add(pattern, one);
+    }
+
+    // trailing 0 and 1
+    char zero = 1;
+    char one = 0;
+    QByteArray pzero = "1";
+    QByteArray pone = "0";
+    for (int i = 2; i < 8; ++i) {
+        zero <<= 1;
+        pzero.prepend('0');
+        add(pzero, &zero);
+
+        one = (one << 1) | 1;
+        pone.prepend('1');
+        add(pone, &one);
+    }
+}
+
+void tst_QBitArray::fromBits()
+{
+    QFETCH(QByteArray, data);
+    QFETCH(int, size);
+    QFETCH(QBitArray, expected);
+
+    QBitArray fromBits = QBitArray::fromBits(data, size);
+    QCOMPARE(fromBits, expected);
+
+    QCOMPARE(QBitArray::fromBits(fromBits.bits(), fromBits.size()), expected);
+}
+
 QTEST_APPLESS_MAIN(tst_QBitArray)
 #include "tst_qbitarray.moc"
diff --git a/tests/auto/gui/kernel/qhighdpiscaling/tst_qhighdpiscaling.cpp b/tests/auto/gui/kernel/qhighdpiscaling/tst_qhighdpiscaling.cpp
index 969b2351ec..ec80c2d02c 100644
--- a/tests/auto/gui/kernel/qhighdpiscaling/tst_qhighdpiscaling.cpp
+++ b/tests/auto/gui/kernel/qhighdpiscaling/tst_qhighdpiscaling.cpp
@@ -36,6 +36,7 @@ class tst_QHighDpiScaling: public QObject
     Q_OBJECT
 
 private slots:
+    void factor();
     void scale();
 };
 
@@ -50,6 +51,23 @@ public:
     QImage::Format format() const override { return QImage::Format_ARGB32_Premultiplied; }
 };
 
+void tst_QHighDpiScaling::factor()
+{
+    QHighDpiScaling::setGlobalFactor(2);
+
+    // Verfy that QHighDpiScaling::factor() does not crash on nullptr contexts.
+    QPoint fakeNativePosition = QPoint(5, 5);
+    QPlatformScreen *screenContext = nullptr;
+    QVERIFY(QHighDpiScaling::factor(screenContext) >= 0);
+    QVERIFY(QHighDpiScaling::factor(screenContext, &fakeNativePosition) >= 0);
+    QPlatformScreen *platformScreenContext = nullptr;
+    QVERIFY(QHighDpiScaling::factor(platformScreenContext) >= 0);
+    QVERIFY(QHighDpiScaling::factor(platformScreenContext, &fakeNativePosition) >= 0);
+    QWindow *windowContext = nullptr;
+    QVERIFY(QHighDpiScaling::factor(windowContext) >= 0);
+    QVERIFY(QHighDpiScaling::factor(windowContext, &fakeNativePosition) >= 0);
+}
+
 // QTBUG-77255: Test some scaling overloads
 void tst_QHighDpiScaling::scale()
 {
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 591fafc7fb..58810f73c1 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -191,6 +191,7 @@ private slots:
 
     void fontTagFace();
 
+    void clearUndoRedoStacks();
 private:
     void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
     void buildRegExpData();
@@ -3522,5 +3523,16 @@ void tst_QTextDocument::fontTagFace()
     }
 }
 
+void tst_QTextDocument::clearUndoRedoStacks()
+{
+    QTextDocument doc;
+    QTextCursor c(&doc);
+    c.insertText(QStringLiteral("lorem ipsum"));
+    QVERIFY(doc.isUndoAvailable());
+    doc.clearUndoRedoStacks(QTextDocument::UndoStack); // Don't crash
+    QVERIFY(!doc.isUndoAvailable());
+}
+
+
 QTEST_MAIN(tst_QTextDocument)
 #include "tst_qtextdocument.moc"
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 63f6e67a3e..da75e64d1e 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -417,20 +417,19 @@ void tst_QWizard::setPixmap()
     QVERIFY(wizard.pixmap(QWizard::BannerPixmap).isNull());
     QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull());
     QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull());
-#ifdef Q_OS_OSX
-    QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#else
-    QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#endif
+    if (QSysInfo::macVersion() <= Q_MV_OSX(10, 13))
+        QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
+    else
+        QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
 
     QVERIFY(page->pixmap(QWizard::BannerPixmap).isNull());
     QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull());
     QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull());
-#ifdef Q_OS_OSX
-    QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#else
-    QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
-#endif
+    if (QSysInfo::macVersion() <= Q_MV_OSX(10, 13))
+        QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
+    else
+        QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
+
     wizard.setPixmap(QWizard::BannerPixmap, p1);
     wizard.setPixmap(QWizard::LogoPixmap, p2);
     wizard.setPixmap(QWizard::WatermarkPixmap, p3);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index a9c1404891..1442219bea 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -88,7 +88,7 @@ static void sendMousePress(QWidget *widget, const QPoint &point, Qt::MouseButton
 static void sendMouseMove(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = 0)
 {
     QTest::mouseMove(widget, point);
-    QMouseEvent event(QEvent::MouseMove, point, button, buttons, 0);
+    QMouseEvent event(QEvent::MouseMove, point, widget->mapToGlobal(point), button, buttons, 0);
     QApplication::sendEvent(widget, &event);
     QApplication::processEvents();
 }