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

3 files changed, 24 insertions, 9 deletions

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";