1 files changed, 19 insertions, 8 deletions
diff --git a/tests/baseline/painting/tst_baseline_painting.cpp b/tests/baseline/painting/tst_baseline_painting.cpp
index fe340e80e6..f486b33430 100644
--- a/tests/baseline/painting/tst_baseline_painting.cpp
+++ b/tests/baseline/painting/tst_baseline_painting.cpp
@@ -1,5 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
 
 #include "paintcommands.h"
 #include <qbaselinetest.h>
@@ -52,7 +54,7 @@ private:
 
 private slots:
     void initTestCase();
-    void cleanupTestCase() {}
+    void init();
 
     void testRasterARGB32PM_data();
     void testRasterARGB32PM();
@@ -120,7 +122,7 @@ void tst_Lancelot::initTestCase()
     std::sort(qpsFiles.begin(), qpsFiles.end());
     foreach (const QString& fileName, qpsFiles) {
         QFile file(scriptsDir + fileName);
-        file.open(QFile::ReadOnly);
+        QVERIFY(file.open(QFile::ReadOnly));
         QByteArray cont = file.readAll();
         scripts.insert(fileName, QString::fromUtf8(cont).split(QLatin1Char('\n'), Qt::SkipEmptyParts));
         scriptChecksums.insert(fileName, qChecksum(cont));
@@ -131,6 +133,11 @@ void tst_Lancelot::initTestCase()
 #endif
 }
 
+void tst_Lancelot::init()
+{
+    // This gets called for every row. QSKIP if current item is blacklisted on the baseline server:
+    QBASELINE_SKIP_IF_BLACKLISTED;
+}
 
 void tst_Lancelot::testRasterARGB32PM_data()
 {
@@ -416,19 +423,22 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format, co
         QString tempStem(QDir::tempPath() + QLatin1String("/lancelot_XXXXXX_") + qpsFile.chopped(4));
 
         QTemporaryFile pdfFile(tempStem + QLatin1String(".pdf"));
-        pdfFile.open();
+        QVERIFY(pdfFile.open());
         QPdfWriter writer(&pdfFile);
         writer.setPdfVersion(QPdfWriter::PdfVersion_1_6);
-        writer.setResolution(150);
+        QPageSize pageSize(QSize(800, 800), QStringLiteral("LancePage"), QPageSize::ExactMatch);
+        writer.setPageSize(pageSize);
+        writer.setPageMargins(QMarginsF());
+        writer.setResolution(72);
         paint(&writer, engine, format, script, QFileInfo(filePath).absoluteFilePath());
         pdfFile.close();
 
         // Convert pdf to something we can read into a QImage, using macOS' sips utility
         QTemporaryFile pngFile(tempStem + QLatin1String(".png"));
-        pngFile.open(); // Just create the file name
+        QVERIFY(pngFile.open()); // Just create the file name
         pngFile.close();
         QProcess proc;
-        const char *rawArgs = "-s format png --cropOffset 20 20 -c 800 800 -o";
+        const char *rawArgs = "-s format png -o";
         QStringList argList = QString::fromLatin1(rawArgs).split(QLatin1Char(' '));
         proc.start(QLatin1String("sips"), argList << pngFile.fileName() << pdfFile.fileName());
         proc.waitForFinished(2 * 60 * 1000); // May need some time
@@ -469,7 +479,8 @@ QTEST_MAIN(tst_Lancelot)
 
 int main(int argc, char *argv[])
 {
-    qSetGlobalQHashSeed(0);   // Avoid rendering variations caused by QHash randomization
+    // Avoid rendering variations caused by QHash randomization
+    QHashSeed::setDeterministicGlobalSeed();
 
     QBaselineTest::handleCmdLineArgs(&argc, &argv);
     return _realmain(argc, argv);