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

 Conflicts:
	src/qml/jit/qv4baselinejit.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Iec7cd27ddad0281bd3b7833fb6b252f66a6ae5d6

10 files changed, 113 insertions, 66 deletions

diff --git a/tests/auto/qml/ecmascripttests/test262 b/tests/auto/qml/ecmascripttests/test262
-Subproject 6b0c42c63c2492bd0a7a96d3179d122b5f71793
+Subproject 3c69133cc419840c1be34638039cd8c48a7ef58
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 269d90c891..fa78e60bba 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -2050,7 +2050,7 @@ void tst_qqmlecmascript::functionErrors()
 
     QObject *resource = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>());
     warning = url + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function");
-    warning = warning.arg(QString::number((quintptr)resource, 16));
+    warning = warning.arg(QString::number(quintptr(resource), 16));
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); // we expect a meaningful warning to be printed.
     QMetaObject::invokeMethod(object, "retrieveScarceResource");
     delete object;
@@ -4575,7 +4575,7 @@ void tst_qqmlecmascript::scarceResources_other()
     eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>());
     QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage.
     expectedWarning = varComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function");
-    expectedWarning = expectedWarning.arg(QString::number((quintptr)eo, 16));
+    expectedWarning = expectedWarning.arg(QString::number(quintptr(eo), 16));
     QTest::ignoreMessage(QtWarningMsg, qPrintable(expectedWarning)); // we expect a meaningful warning to be printed.
     QMetaObject::invokeMethod(object, "retrieveScarceResource");
     QVERIFY(!object->property("scarceResourceCopy").isValid()); // due to exception, assignment will NOT have occurred.
@@ -4649,7 +4649,7 @@ void tst_qqmlecmascript::scarceResources_other()
     eo = qobject_cast<ScarceResourceObject*>(QQmlProperty::read(object, "a").value<QObject*>());
     QVERIFY(eo->scarceResourceIsDetached()); // should be no other copies of it at this stage.
     expectedWarning = variantComponentTwelve.url().toString() + QLatin1String(":16: TypeError: Property 'scarceResource' of object ScarceResourceObject(0x%1) is not a function");
-    expectedWarning = expectedWarning.arg(QString::number((quintptr)eo, 16));
+    expectedWarning = expectedWarning.arg(QString::number(quintptr(eo), 16));
     QTest::ignoreMessage(QtWarningMsg, qPrintable(expectedWarning)); // we expect a meaningful warning to be printed.
     QMetaObject::invokeMethod(object, "retrieveScarceResource");
     QVERIFY(!object->property("scarceResourceCopy").isValid()); // due to exception, assignment will NOT have occurred.
diff --git a/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml
index 6a1c0632ad..49838c4fd5 100644
--- a/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml
+++ b/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml
@@ -60,8 +60,8 @@ Item {
         id: testCase
         name: "Tests_GridLayout"
         when: windowShown
-        width: 200
-        height: 200
+        width: parent.width
+        height: parent.height
 
         Component {
             id: layout_flow_Component
@@ -84,7 +84,7 @@ Item {
 
         function test_flow()
         {
-            var layout = layout_flow_Component.createObject(container);
+            var layout = createTemporaryObject(layout_flow_Component, container);
             tryCompare(layout.children[0], "itemRect", [ 0,  0, 10, 10])
             tryCompare(layout.children[1], "itemRect", [10,  0, 10, 10])
             tryCompare(layout.children[2], "itemRect", [20,  0, 10, 10])
@@ -102,8 +102,6 @@ Item {
 
             tryCompare(layout.children[4], "itemRect", [10,  0, 10, 10])
             tryCompare(layout.children[5], "itemRect", [10, 10, 10, 10])
-
-            layout.destroy()
         }
 
         Component {
@@ -178,7 +176,7 @@ Item {
         }
 
         function test_flowLeftToRight() {
-            var layout = layout_flowLeftToRight_Component.createObject(container);
+            var layout = createTemporaryObject(layout_flowLeftToRight_Component, container);
             compare(layout.implicitWidth, 80);
             compare(layout.children[0].x, 0);
             compare(layout.children[0].y, 0);
@@ -208,8 +206,6 @@ Item {
             compare(layout.children[11].y, 60);
             compare(layout.children[12].x, 40);
             compare(layout.children[12].y, 80);
-
-            layout.destroy();
         }
 
 
@@ -259,7 +255,7 @@ Item {
 
         function test_flowLeftToRightDefaultPositions() {
             ignoreWarning("QGridLayoutEngine::addItem: Cell (1, 0) already taken");
-            var layout = layout_flowLeftToRightDefaultPositions_Component.createObject(container);
+            var layout = createTemporaryObject(layout_flowLeftToRightDefaultPositions_Component, container);
             compare(layout.implicitWidth, 40);
             compare(layout.children[0].x, 0);
             compare(layout.children[0].y, 0);
@@ -267,7 +263,6 @@ Item {
             compare(layout.children[1].y, 20);
             compare(layout.children[2].x, 20);
             compare(layout.children[2].y, 20);
-            layout.destroy();
         }
 
 
@@ -342,7 +337,7 @@ Item {
         }
 
         function test_flowTopToBottom() {
-            var layout = layout_flowTopToBottom_Component.createObject(container);
+            var layout = createTemporaryObject(layout_flowTopToBottom_Component, container);
             compare(layout.children[0].x, 0);
             compare(layout.children[0].y, 0);
             compare(layout.children[1].x, 20);
@@ -371,8 +366,6 @@ Item {
             compare(layout.children[11].y, 60);
             compare(layout.children[12].x, 80);
             compare(layout.children[12].y, 0);
-
-            layout.destroy();
         }
 
         Component {
@@ -432,7 +425,7 @@ Item {
         }
 
         function test_spanAcrossEmptyRows() {
-            var layout = layout_spanAcrossEmptyRows_Component.createObject(container);
+            var layout = createTemporaryObject(layout_spanAcrossEmptyRows_Component, container);
             compare(layout.children[0].x, 0);
             compare(layout.children[0].y, 0);
             compare(layout.children[1].x, 20);
@@ -442,8 +435,6 @@ Item {
 
             compare(layout.implicitWidth, 60);
             compare(layout.Layout.maximumWidth, 120);
-
-            layout.destroy();
         }
 
         Component {
@@ -463,14 +454,13 @@ Item {
         }
 
         function test_spanIsMoreThanColumns() {
-            var layout = layout_spanIsMoreThanColumns_Component.createObject(container);
+            var layout = createTemporaryObject(layout_spanIsMoreThanColumns_Component, container);
             // item was not added, therefore implicit width is 0
             compare(layout.implicitWidth, 0);
-            layout.destroy();
         }
 
         function test_sizeHints() {
-            var layout = layout_spanAcrossEmptyRows_Component.createObject(container);
+            var layout = createTemporaryObject(layout_spanAcrossEmptyRows_Component, container);
             compare(layout.visible, true)
 
             var minWidth  = layout.Layout.minimumWidth
@@ -489,8 +479,6 @@ Item {
             compare(prefHeight, layout.implicitHeight)
             compare(maxWidth, layout.Layout.maximumWidth)
             compare(maxHeight, layout.Layout.maximumHeight)
-
-            layout.destroy();
         }
 
         Component {
@@ -567,7 +555,7 @@ Item {
 
         function test_alignment()
         {
-            var layout = layout_alignment_Component.createObject(container);
+            var layout = createTemporaryObject(layout_alignment_Component, container);
             layout.width = 60;
             layout.height = 100;
 
@@ -596,8 +584,6 @@ Item {
             layout.children[4].Layout.alignment = Qt.AlignLeft
             tryCompare(layout.children[4], "x", 0);
             tryCompare(layout.children[4], "y", 60);
-
-            layout.destroy();
         }
 
 
@@ -648,7 +634,7 @@ Item {
 
         function test_rightToLeft()
         {
-            var layout = layout_rightToLeft_Component.createObject(container);
+            var layout = createTemporaryObject(layout_rightToLeft_Component, container);
             layout.width = 180;
             layout.height = 50;
 
@@ -674,8 +660,6 @@ Item {
 
             layout.LayoutMirroring.enabled = true
             verifyIsRightToLeft(layout)
-
-            layout.destroy();
         }
 
         Component {
@@ -698,7 +682,7 @@ Item {
 
         function test_columnsChanged()
         {
-            var layout = layout_columnsOrRowsChanged_Component.createObject(container);
+            var layout = createTemporaryObject(layout_columnsOrRowsChanged_Component, container);
             layout.width = 40;
             layout.height = 20;
             tryCompare(layout.children[0], "itemRect", [ 0,  5,  10, 10])
@@ -711,13 +695,11 @@ Item {
             tryCompare(layout.children[1], "itemRect", [20,  0,  10, 10])
             tryCompare(layout.children[2], "itemRect", [ 0, 10,  10, 10])
             tryCompare(layout.children[3], "itemRect", [20, 10,  10, 10])
-
-            layout.destroy()
         }
 
         function test_rowsChanged()
         {
-            var layout = layout_columnsOrRowsChanged_Component.createObject(container);
+            var layout = createTemporaryObject(layout_columnsOrRowsChanged_Component, container);
             layout.flow = GridLayout.TopToBottom
             layout.width = 20;
             layout.height = 40;
@@ -731,8 +713,6 @@ Item {
             tryCompare(layout.children[1], "itemRect", [ 0, 25,  10, 10])
             tryCompare(layout.children[2], "itemRect", [10,  5,  10, 10])
             tryCompare(layout.children[3], "itemRect", [10, 25,  10, 10])
-
-            layout.destroy()
         }
 
         Component {
@@ -767,7 +747,7 @@ Item {
 
         function test_columnOrRowChanged()
         {
-            var layout = layout_columnOrRowChanged_Component.createObject(container);
+            var layout = createTemporaryObject(layout_columnOrRowChanged_Component, container);
             layout.width = layout.implicitWidth
             layout.height = layout.implicitHeight
             // c0-c1-c2
@@ -795,8 +775,6 @@ Item {
             tryCompare(layout.children[0], "itemRect", [10, 10,  10, 10])
             tryCompare(layout.children[1], "itemRect", [ 0,  0,  10, 10])
             tryCompare(layout.children[2], "itemRect", [20,  0,  10, 10])
-
-            layout.destroy()
         }
 
         Component {
@@ -819,7 +797,7 @@ Item {
         }
         function test_baselines()
         {
-            var layout = layout_baselines_Component.createObject(container);
+            var layout = createTemporaryObject(layout_baselines_Component, container);
             tryCompare(layout.children[0], "itemRect", [ 0, 0, 10, 10])
             tryCompare(layout.children[1], "itemRect", [10, 0, 10, 10])
             compare(layout.implicitWidth, 20)
@@ -832,8 +810,6 @@ Item {
             tryCompare(layout.children[1], "itemRect", [10, 10, 10, 10])
             compare(layout.implicitWidth, 20)
             compare(layout.implicitHeight, 20)
-
-            layout.destroy();
         }
 
         Component {
@@ -851,30 +827,42 @@ Item {
             }
         }
 
-        function test_spacings()
+        function test_spacings_data()
+        {
+            let data = [
+                { spacing: Number.NaN },
+                { spacing: 0 },
+                { spacing: 10 },
+                { spacing: -5 },
+                { spacing: -19 }
+            ]
+            for (let i = 0; i < data.length; ++i) {
+                data[i].tag = data[i].spacing.toString()
+            }
+            return data
+        }
+
+        function test_spacings(data)
         {
-            var layout = layout_spacings_Component.createObject(container);
+            var layout = createTemporaryObject(layout_spacings_Component, container);
 
             // breaks down below -19. This is acceptable, since it means that the implicit size of the layout is negative
             var testSpacings = [Number.NaN, 0, 10, -5, -19]
             layout.rowSpacing = 0
-            for (var i = 0; i < testSpacings.length; ++i) {
-                var sp = testSpacings[i]
-                if (isNaN(sp)) {
-                    sp = 5  // Test defaults
-                } else {
-                    layout.columnSpacing = sp
-                }
-                tryCompare(layout.children[0], "itemRect", [ 0,  0,  10,  10])
-                tryCompare(layout.children[1], "itemRect", [10 + sp,  0,  10,  10])
-                compare(layout.implicitWidth, 20 + sp)
+            var spacing = data.spacing
+            if (isNaN(spacing)) {
+                spacing = 5  // Test defaults
+            } else {
+                layout.columnSpacing = spacing
             }
+            tryCompare(layout.children[0], "itemRect", [ 0,  0,  10,  10])
+            tryCompare(layout.children[1], "itemRect", [10 + spacing,  0,  10,  10])
+            compare(layout.implicitWidth, 20 + spacing)
 
             // do not crash
             layout.columnSpacing = -100
             waitForRendering(layout)
             verify(isFinite(layout.implicitWidth))
-            layout.destroy();
         }
 
         Component {
@@ -1026,11 +1014,10 @@ Item {
 
         function test_invalidateWhileRearranging_QTBUG_44139()
         {
-            var layout = layout_invalidateWhileRearranging_Component.createObject(container)
+            var layout = createTemporaryObject(layout_invalidateWhileRearranging_Component, container)
 
             waitForRendering(layout);
             verify(layout.children[1].visible == false);
-            layout.destroy()
         }
     }
 }
diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST
new file mode 100644
index 0000000000..f2cb00225b
--- /dev/null
+++ b/tests/auto/quick/qquickmousearea/BLACKLIST
@@ -0,0 +1,4 @@
+# QTBUG-78153
+[nestedStopAtBounds]
+opensuse-leap
+
diff --git a/tests/auto/quick/qquicktext/data/transparentBackground.qml b/tests/auto/quick/qquicktext/data/transparentBackground.qml
new file mode 100644
index 0000000000..a10a1779bb
--- /dev/null
+++ b/tests/auto/quick/qquicktext/data/transparentBackground.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 200
+    height: 200
+    color: "white"
+    Text {
+        objectName: "text"
+        textFormat: Text.RichText
+        anchors.fill: parent
+        color: "black"
+        text: "<h1 style=\"background-color:rgba(255,255,255,0.00)\">foo</h1>"
+        verticalAlignment: Text.AlignTop
+        horizontalAlignment: Text.AlignLeft
+    }
+}
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 97107694bd..e62db81d27 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -164,6 +164,8 @@ private slots:
 
     void verticallyAlignedImageInTable();
 
+    void transparentBackground();
+
 private:
     QStringList standard;
     QStringList richText;
@@ -4429,6 +4431,26 @@ void tst_qquicktext::verticallyAlignedImageInTable()
     // Don't crash
 }
 
+void tst_qquicktext::transparentBackground()
+{
+    if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
+        || (QGuiApplication::platformName() == QLatin1String("minimal")))
+        QSKIP("Skipping due to grabToImage not functional on offscreen/minimimal platforms");
+
+    QScopedPointer<QQuickView> window(new QQuickView);
+    window->setSource(testFileUrl("transparentBackground.qml"));
+    QTRY_COMPARE(window->status(), QQuickView::Ready);
+
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+    QImage img = window->grabWindow();
+    QCOMPARE(img.isNull(), false);
+
+    QColor color = img.pixelColor(0, 0);
+    QCOMPARE(color.red(), 255);
+    QCOMPARE(color.blue(), 255);
+    QCOMPARE(color.green(), 255);
+}
 QTEST_MAIN(tst_qquicktext)
 
 #include "tst_qquicktext.moc"
diff --git a/tests/auto/quick/qquicktextinput/BLACKLIST b/tests/auto/quick/qquicktextinput/BLACKLIST
new file mode 100644
index 0000000000..ada7c57c75
--- /dev/null
+++ b/tests/auto/quick/qquicktextinput/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-78162
+[mouseSelectionMode]
+opensuse-leap
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
index 6da0799bbc..23c678380c 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
@@ -36,6 +36,11 @@
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
 
+#ifdef Q_OS_WIN
+#  include <fcntl.h>
+#  include <io.h>
+#endif // Q_OS_WIN
+
 // Timeout values:
 
 // A valid screen grab requires the scene to not change
@@ -101,6 +106,10 @@ private slots:
 #endif
         if (ofile == "-") {   // Write to stdout
             QFile of;
+#ifdef Q_OS_WIN
+            // Make sure write to stdout doesn't do LF->CRLF
+            _setmode(_fileno(stdout), _O_BINARY);
+#endif // Q_OS_WIN
             if (!of.open(1, QIODevice::WriteOnly) || !lastGrab.save(&of, "ppm")) {
                 qWarning() << "Error: failed to write grabbed image to stdout.";
                 QGuiApplication::exit(2);
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/scenegraph.pro b/tests/manual/scenegraph_lancelot/scenegraph/scenegraph.pro
index 65819ab5bf..dd0ef268b1 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/scenegraph.pro
+++ b/tests/manual/scenegraph_lancelot/scenegraph/scenegraph.pro
@@ -9,3 +9,7 @@ SOURCES += tst_scenegraph.cpp
 # Include Lancelot protocol code to communicate with baseline server.
 # Assuming that we are in a normal Qt5 source code tree
 include(../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.pri)
+
+TEST_HELPER_INSTALLS += .././qmlscenegrabber
+
+TESTDATA += ../data
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
index 95188ec0f8..40b17ec2a2 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
+++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
@@ -68,6 +68,7 @@ private:
     bool renderAndGrab(const QString& qmlFile, const QStringList& extraArgs, QImage *screenshot, QString *errMsg);
     quint16 checksumFileOrDir(const QString &path);
 
+    QString testSuitePath;
     int consecutiveErrors;   // Not test failures (image mismatches), but system failures (so no image at all)
     bool aborted;            // This run given up because of too many system failures
 };
@@ -81,6 +82,14 @@ tst_Scenegraph::tst_Scenegraph()
 
 void tst_Scenegraph::initTestCase()
 {
+    QString dataDir = QFINDTESTDATA("../data/.");
+    if (dataDir.isEmpty())
+        dataDir = QStringLiteral("data");
+    QFileInfo fi(dataDir);
+    if (!fi.exists() || !fi.isDir() || !fi.isReadable())
+        QSKIP("Test suite data directory missing or unreadable: " + fi.canonicalFilePath().toLatin1());
+    testSuitePath = fi.canonicalFilePath();
+
     const char *backendVarName = "QT_QUICK_BACKEND";
     const QString backend = qEnvironmentVariable(backendVarName, QString::fromLatin1("default"));
     QBaselineTest::addClientProperty(QString::fromLatin1(backendVarName), backend);
@@ -95,7 +104,7 @@ void tst_Scenegraph::cleanup()
 {
     // Allow subsystems time to settle
     if (!aborted)
-        QTest::qWait(200);
+        QTest::qWait(20);
 }
 
 void tst_Scenegraph::testNoTextRendering_data()
@@ -131,13 +140,6 @@ void tst_Scenegraph::setupTestSuite(const QByteArray& filter)
     QTest::addColumn<QString>("qmlFile");
     int numItems = 0;
 
-    QString testSuiteDir = QLatin1String("data");
-    QString testSuiteLocation = QCoreApplication::applicationDirPath();
-    QString testSuitePath = testSuiteLocation + QDir::separator() + testSuiteDir;
-    QFileInfo fi(testSuitePath);
-    if (!fi.exists() || !fi.isDir() || !fi.isReadable())
-        QSKIP("Test suite data directory missing or unreadable: " + testSuitePath.toLatin1());
-
     QStringList ignoreItems;
     QFile ignoreFile(testSuitePath + "/Ignore");
     if (ignoreFile.open(QIODevice::ReadOnly)) {
@@ -237,7 +239,7 @@ quint16 tst_Scenegraph::checksumFileOrDir(const QString &path)
         QFile f(path);
         f.open(QIODevice::ReadOnly);
         QByteArray contents = f.readAll();
-        return qChecksum(contents.constData(), contents.size());
+        return qChecksum(contents.constData(), uint(contents.size()));
     }
     if (fi.isDir()) {
         static const QStringList nameFilters = QStringList() << "*.qml" << "*.cpp" << "*.png" << "*.jpg";