Refactor Lancelot test

Follow the new structure for lancelot tests
found in qtbase and qtdeclarative. the test
is moved to tests\baseline, and the instruction
file has been updated.

Change-Id: I2995b0f6707e0dad3c47dd32b265e5fd4fc7cd00
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit a7c09989b303464d08e12bf9a17b219d7bdff022)

523 files changed, 34 insertions, 2043 deletions

diff --git a/tests/auto/quick3d_lancelot/CMakeLists.txt b/tests/auto/quick3d_lancelot/CMakeLists.txt
deleted file mode 100644
index 4767fd06..00000000
--- a/tests/auto/quick3d_lancelot/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Generated from quick3d_lancelot.pro.
-
-add_subdirectory(scenegrabber)
-add_subdirectory(quick3d)
diff --git a/tests/auto/quick3d_lancelot/hostinfo.sh b/tests/auto/quick3d_lancelot/hostinfo.sh
deleted file mode 100644
index f8bdcd00..00000000
--- a/tests/auto/quick3d_lancelot/hostinfo.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# printProperty(): prints a key-value pair from given key and cmd list.
-# If running cmd fails, or does not produce any stdout, nothing is printed.
-# Arguments: $1: key, $2: cmd, $3: optional, field specification as to cut(1) -f
-printProperty ()
-{
-    key=$1
-    val=`{ eval $2 ; } 2>/dev/null`
-    [ -n "$3" ] && val=`echo $val | tr -s '[:blank:]' '\t' | cut -f$3`
-    [ -n "$val" ] && echo $key: $val
-}
-
-# printEnvVar(): prints a key-value pair from given environment variable name.
-# key is printed as "Env_<varname>".
-# If the variable is undefined, nothing is printed.
-# Arguments: $1: varname
-
-printEnvVar ()
-{
-    key=Env_$1
-    val=`eval 'echo $'$1`
-    [ -n "$val" ] && echo $key: $val
-}
-
-
-# printOnOff(): prints a key-value pair from given environment variable name.
-# If variable is defined, value is printed as "<key>-On"; otherwise "<key>-Off".
-# Arguments: $1: key $2: varname
-
-printOnOff ()
-{
-    key=$1
-    val=`eval 'echo $'$2`
-    if [ -z "$val" ] ; then
-        val=Off
-    else
-        val=On
-    fi
-    echo $key: $key-$val
-}
-
-# ------------
-
-printProperty Uname              "uname -a"
-
-printProperty WlanMAC            "ifconfig wlan0 | grep HWaddr" 5
-
-printEnvVar QMLSCENE_DEVICE
diff --git a/tests/auto/quick3d_lancelot/shared/baselineprotocol.cpp b/tests/auto/quick3d_lancelot/shared/baselineprotocol.cpp
deleted file mode 100644
index d3da66c6..00000000
--- a/tests/auto/quick3d_lancelot/shared/baselineprotocol.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#include "baselineprotocol.h"
-#include <QLibraryInfo>
-#include <QImage>
-#include <QBuffer>
-#include <QHostInfo>
-#include <QSysInfo>
-#if QT_CONFIG(process)
-# include <QProcess>
-#endif
-#include <QFileInfo>
-#include <QDir>
-#include <QThread>
-#include <QTime>
-#include <QPointer>
-#include <QRegularExpression>
-
-const QString PI_Project(QLS("Project"));
-const QString PI_TestCase(QLS("TestCase"));
-const QString PI_HostName(QLS("HostName"));
-const QString PI_HostAddress(QLS("HostAddress"));
-const QString PI_OSName(QLS("OSName"));
-const QString PI_OSVersion(QLS("OSVersion"));
-const QString PI_QtVersion(QLS("QtVersion"));
-const QString PI_QtBuildMode(QLS("QtBuildMode"));
-const QString PI_GitCommit(QLS("GitCommit"));
-const QString PI_QMakeSpec(QLS("QMakeSpec"));
-const QString PI_PulseGitBranch(QLS("PulseGitBranch"));
-const QString PI_PulseTestrBranch(QLS("PulseTestrBranch"));
-
-#ifndef QMAKESPEC
-#define QMAKESPEC "Unknown"
-#endif
-
-PlatformInfo::PlatformInfo()
-    : QMap<QString, QString>(), adHoc(true)
-{
-}
-
-PlatformInfo PlatformInfo::localHostInfo()
-{
-    PlatformInfo pi;
-    pi.insert(PI_HostName, QHostInfo::localHostName());
-    pi.insert(PI_QtVersion, QLS(qVersion()));
-    pi.insert(PI_QMakeSpec, QString(QLS(QMAKESPEC)).remove(QRegularExpression(QLS("^.*mkspecs/"))));
-#if QT_VERSION >= 0x050000
-    pi.insert(PI_QtBuildMode, QLibraryInfo::isDebugBuild() ? QLS("QtDebug") : QLS("QtRelease"));
-#endif
-#if defined(Q_OS_LINUX) && QT_CONFIG(process)
-    pi.insert(PI_OSName, QLS("Linux"));
-#elif defined(Q_OS_WIN)
-    pi.insert(PI_OSName, QLS("Windows"));
-#elif defined(Q_OS_DARWIN)
-    pi.insert(PI_OSName, QLS("Darwin"));
-#else
-    pi.insert(PI_OSName, QLS("Other"));
-#endif
-    pi.insert(PI_OSVersion, QSysInfo::kernelVersion());
-
-#if QT_CONFIG(process)
-    QProcess git;
-    QString cmd;
-    QStringList args;
-#if defined(Q_OS_WIN)
-    cmd = QLS("cmd.exe");
-    args << QLS("/c") << QLS("git");
-#else
-    cmd = QLS("git");
-#endif
-    args << QLS("log") << QLS("--max-count=1") << QLS("--pretty=%H [%an] [%ad] %s");
-    git.start(cmd, args);
-    git.waitForFinished(3000);
-    if (!git.exitCode())
-        pi.insert(PI_GitCommit, QString::fromLocal8Bit(git.readAllStandardOutput().constData()).simplified());
-    else
-        pi.insert(PI_GitCommit, QLS("Unknown"));
-
-    QByteArray gb = qgetenv("PULSE_GIT_BRANCH");
-    if (!gb.isEmpty()) {
-        pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb));
-        pi.setAdHocRun(false);
-    }
-    QByteArray tb = qgetenv("PULSE_TESTR_BRANCH");
-    if (!tb.isEmpty()) {
-        pi.insert(PI_PulseTestrBranch, QString::fromLatin1(tb));
-        pi.setAdHocRun(false);
-    }
-    if (!qgetenv("JENKINS_HOME").isEmpty()) {
-        pi.setAdHocRun(false);
-        gb = qgetenv("GIT_BRANCH");
-        if (!gb.isEmpty()) {
-            // FIXME: the string "Pulse" should be eliminated, since that is not the used tool.
-            pi.insert(PI_PulseGitBranch, QString::fromLatin1(gb));
-        }
-    }
-#endif // QT_CONFIG(process)
-
-    return pi;
-}
-
-
-PlatformInfo::PlatformInfo(const PlatformInfo &other)
-    : QMap<QString, QString>(other)
-{
-    orides = other.orides;
-    adHoc = other.adHoc;
-}
-
-
-PlatformInfo &PlatformInfo::operator=(const PlatformInfo &other)
-{
-    QMap<QString, QString>::operator=(other);
-    orides = other.orides;
-    adHoc = other.adHoc;
-    return *this;
-}
-
-
-void PlatformInfo::addOverride(const QString& key, const QString& value)
-{
-    orides.append(key);
-    orides.append(value);
-}
-
-
-QStringList PlatformInfo::overrides() const
-{
-    return orides;
-}
-
-
-void PlatformInfo::setAdHocRun(bool isAdHoc)
-{
-    adHoc = isAdHoc;
-}
-
-
-bool PlatformInfo::isAdHocRun() const
-{
-    return adHoc;
-}
-
-
-QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi)
-{
-    stream << static_cast<const QMap<QString, QString>&>(pi);
-    stream << pi.orides << pi.adHoc;
-    return stream;
-}
-
-
-QDataStream & operator>> (QDataStream &stream, PlatformInfo &pi)
-{
-    stream >> static_cast<QMap<QString, QString>&>(pi);
-    stream >> pi.orides >> pi.adHoc;
-    return stream;
-}
-
-
-ImageItem &ImageItem::operator=(const ImageItem &other)
-{
-    testFunction = other.testFunction;
-    itemName = other.itemName;
-    itemChecksum = other.itemChecksum;
-    status = other.status;
-    image = other.image;
-    imageChecksums = other.imageChecksums;
-    return *this;
-}
-
-// Defined in lookup3.c:
-void hashword2 (
-const quint32 *k,         /* the key, an array of quint32 values */
-size_t         length,    /* the length of the key, in quint32s */
-quint32       *pc,        /* IN: seed OUT: primary hash value */
-quint32       *pb);       /* IN: more seed OUT: secondary hash value */
-
-quint64 ImageItem::computeChecksum(const QImage &image)
-{
-    QImage img(image);
-    const int bpl = img.bytesPerLine();
-    const int padBytes = bpl - (img.width() * img.depth() / 8);
-    if (padBytes) {
-        uchar *p = img.bits() + bpl - padBytes;
-        const int h = img.height();
-        for (int y = 0; y < h; ++y) {
-            memset(p, 0, padBytes);
-            p += bpl;
-        }
-    }
-
-    quint32 h1 = 0xfeedbacc;
-    quint32 h2 = 0x21604894;
-    hashword2((const quint32 *)img.constBits(), img.sizeInBytes()/4, &h1, &h2);
-    return (quint64(h1) << 32) | h2;
-}
-
-#if 0
-QString ImageItem::engineAsString() const
-{
-    switch (engine) {
-    case Raster:
-        return QLS("Raster");
-        break;
-    case OpenGL:
-        return QLS("OpenGL");
-        break;
-    default:
-        break;
-    }
-    return QLS("Unknown");
-}
-
-QString ImageItem::formatAsString() const
-{
-    static const int numFormats = 16;
-    static const char *formatNames[numFormats] = {
-        "Invalid",
-        "Mono",
-        "MonoLSB",
-        "Indexed8",
-        "RGB32",
-        "ARGB32",
-        "ARGB32-Premult",
-        "RGB16",
-        "ARGB8565-Premult",
-        "RGB666",
-        "ARGB6666-Premult",
-        "RGB555",
-        "ARGB8555-Premult",
-        "RGB888",
-        "RGB444",
-        "ARGB4444-Premult"
-    };
-    if (renderFormat < 0 || renderFormat >= numFormats)
-        return QLS("UnknownFormat");
-    return QLS(formatNames[renderFormat]);
-}
-#endif
-
-void ImageItem::writeImageToStream(QDataStream &out) const
-{
-    if (image.isNull() || image.format() == QImage::Format_Invalid) {
-        out << quint8(0);
-        return;
-    }
-    out << quint8('Q') << quint8(image.format());
-    out << quint8(QSysInfo::ByteOrder) << quint8(0);       // pad to multiple of 4 bytes
-    out << quint32(image.width()) << quint32(image.height()) << quint32(image.bytesPerLine());
-    out << qCompress((const uchar *)image.constBits(), image.sizeInBytes());
-    //# can be followed by colormap for formats that use it
-}
-
-void ImageItem::readImageFromStream(QDataStream &in)
-{
-    quint8 hdr, fmt, endian, pad;
-    quint32 width, height, bpl;
-    QByteArray data;
-
-    in >> hdr;
-    if (hdr != 'Q') {
-        image = QImage();
-        return;
-    }
-    in >> fmt >> endian >> pad;
-    if (!fmt || fmt >= QImage::NImageFormats) {
-        image = QImage();
-        return;
-    }
-    if (endian != QSysInfo::ByteOrder) {
-        qWarning("ImageItem cannot read streamed image with different endianness");
-        image = QImage();
-        return;
-    }
-    in >> width >> height >> bpl;
-    in >> data;
-    data = qUncompress(data);
-    QImage res((const uchar *)data.constData(), width, height, bpl, QImage::Format(fmt));
-    image = res.copy();  //# yuck, seems there is currently no way to avoid data copy
-}
-
-QDataStream & operator<< (QDataStream &stream, const ImageItem &ii)
-{
-    stream << ii.testFunction << ii.itemName << ii.itemChecksum << quint8(ii.status) << ii.imageChecksums << ii.misc;
-    ii.writeImageToStream(stream);
-    return stream;
-}
-
-QDataStream & operator>> (QDataStream &stream, ImageItem &ii)
-{
-    quint8 encStatus;
-    stream >> ii.testFunction >> ii.itemName >> ii.itemChecksum >> encStatus >> ii.imageChecksums >> ii.misc;
-    ii.status = ImageItem::ItemStatus(encStatus);
-    ii.readImageFromStream(stream);
-    return stream;
-}
-
-BaselineProtocol::BaselineProtocol()
-{
-}
-
-BaselineProtocol::~BaselineProtocol()
-{
-    disconnect();
-}
-
-bool BaselineProtocol::disconnect()
-{
-    socket.close();
-    return (socket.state() == QTcpSocket::UnconnectedState) ? true : socket.waitForDisconnected(Timeout);
-}
-
-
-bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const PlatformInfo& clientInfo)
-{
-    errMsg.clear();
-    QByteArray serverName(qgetenv("QT_LANCELOT_SERVER"));
-    if (serverName.isNull())
-        serverName = "lancelot.test.qt-project.org";
-
-    socket.connectToHost(serverName, ServerPort);
-    if (!socket.waitForConnected(Timeout)) {
-        QThread::msleep(3000);  // Wait a bit and try again, the server might just be restarting
-        if (!socket.waitForConnected(Timeout)) {
-            errMsg += QLS("TCP connectToHost failed. Host:") + QLS(serverName) + QLS(" port:") + QString::number(ServerPort);
-            return false;
-        }
-    }
-
-    PlatformInfo pi = clientInfo.isEmpty() ? PlatformInfo::localHostInfo() : clientInfo;
-    pi.insert(PI_TestCase, testCase);
-    QByteArray block;
-    QDataStream ds(&block, QIODevice::ReadWrite);
-    ds << pi;
-    if (!sendBlock(AcceptPlatformInfo, block)) {
-        errMsg += QLS("Failed to send data to server.");
-        return false;
-    }
-
-    Command cmd = UnknownError;
-    if (!receiveBlock(&cmd, &block)) {
-        errMsg.prepend(QLS("Failed to get response from server. "));
-        return false;
-    }
-
-    if (cmd == Abort) {
-        errMsg += QLS("Server rejected connection. Reason: ") + QString::fromLatin1(block);
-        return false;
-    }
-
-    if (dryrun)
-        *dryrun = (cmd == DoDryRun);
-
-    if (cmd != Ack && cmd != DoDryRun) {
-        errMsg += QLS("Unexpected response from server.");
-        return false;
-    }
-
-    return true;
-}
-
-
-bool BaselineProtocol::acceptConnection(PlatformInfo *pi)
-{
-    errMsg.clear();
-
-    QByteArray block;
-    Command cmd = AcceptPlatformInfo;
-    if (!receiveBlock(&cmd, &block) || cmd != AcceptPlatformInfo)
-        return false;
-
-    if (pi) {
-        QDataStream ds(block);
-        ds >> *pi;
-        pi->insert(PI_HostAddress, socket.peerAddress().toString());
-    }
-
-    return true;
-}
-
-
-bool BaselineProtocol::requestBaselineChecksums(const QString &testFunction, ImageItemList *itemList)
-{
-    errMsg.clear();
-    if (!itemList)
-        return false;
-
-    for (ImageItemList::iterator it = itemList->begin(); it != itemList->end(); it++)
-        it->testFunction = testFunction;
-
-    QByteArray block;
-    QDataStream ds(&block, QIODevice::WriteOnly);
-    ds << *itemList;
-    if (!sendBlock(RequestBaselineChecksums, block))
-        return false;
-
-    Command cmd;
-    QByteArray rcvBlock;
-    if (!receiveBlock(&cmd, &rcvBlock) || cmd != BaselineProtocol::Ack)
-        return false;
-    QDataStream rds(&rcvBlock, QIODevice::ReadOnly);
-    rds >> *itemList;
-    return true;
-}
-
-
-bool BaselineProtocol::submitMatch(const ImageItem &item, QByteArray *serverMsg)
-{
-    Command cmd;
-    ImageItem smallItem = item;
-    smallItem.image = QImage();  // No need to waste bandwidth sending image (identical to baseline) to server
-    return (sendItem(AcceptMatch, smallItem) && receiveBlock(&cmd, serverMsg) && cmd == Ack);
-}
-
-
-bool BaselineProtocol::submitNewBaseline(const ImageItem &item, QByteArray *serverMsg)
-{
-    Command cmd;
-    return (sendItem(AcceptNewBaseline, item) && receiveBlock(&cmd, serverMsg) && cmd == Ack);
-}
-
-
-bool BaselineProtocol::submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch)
-{
-    Command cmd;
-    if (sendItem(AcceptMismatch, item) && receiveBlock(&cmd, serverMsg) && (cmd == Ack || cmd == FuzzyMatch)) {
-        if (fuzzyMatch)
-            *fuzzyMatch = (cmd == FuzzyMatch);
-        return true;
-    }
-    return false;
-}
-
-
-bool BaselineProtocol::sendItem(Command cmd, const ImageItem &item)
-{
-    errMsg.clear();
-    QBuffer buf;
-    buf.open(QIODevice::WriteOnly);
-    QDataStream ds(&buf);
-    ds << item;
-    if (!sendBlock(cmd, buf.data())) {
-        errMsg.prepend(QLS("Failed to submit image to server. "));
-        return false;
-    }
-    return true;
-}
-
-
-bool BaselineProtocol::sendBlock(Command cmd, const QByteArray &block)
-{
-    QDataStream s(&socket);
-    // TBD: set qds version as a constant
-    s << quint16(ProtocolVersion) << quint16(cmd);
-    s.writeBytes(block.constData(), block.size());
-    return true;
-}
-
-
-bool BaselineProtocol::receiveBlock(Command *cmd, QByteArray *block)
-{
-    while (socket.bytesAvailable() < int(2*sizeof(quint16) + sizeof(quint32))) {
-        if (!socket.waitForReadyRead(Timeout))
-            return false;
-    }
-    QDataStream ds(&socket);
-    quint16 rcvProtocolVersion, rcvCmd;
-    ds >> rcvProtocolVersion >> rcvCmd;
-    if (rcvProtocolVersion != ProtocolVersion) {
-        errMsg = QLS("Baseline protocol version mismatch, received:") + QString::number(rcvProtocolVersion)
-                + QLS(" expected:") + QString::number(ProtocolVersion);
-        return false;
-    }
-    if (cmd)
-        *cmd = Command(rcvCmd);
-
-    QByteArray uMsg;
-    quint32 remaining;
-    ds >> remaining;
-    uMsg.resize(remaining);
-    int got = 0;
-    char* uMsgBuf = uMsg.data();
-    do {
-        got = ds.readRawData(uMsgBuf, remaining);
-        remaining -= got;
-        uMsgBuf += got;
-    } while (remaining && got >= 0 && socket.waitForReadyRead(Timeout));
-
-    if (got < 0)
-        return false;
-
-    if (block)
-        *block = uMsg;
-
-    return true;
-}
-
-
-QString BaselineProtocol::errorMessage()
-{
-    QString ret = errMsg;
-    if (socket.error() >= 0)
-        ret += QLS(" Socket state: ") + socket.errorString();
-    return ret;
-}
-
diff --git a/tests/auto/quick3d_lancelot/shared/baselineprotocol.h b/tests/auto/quick3d_lancelot/shared/baselineprotocol.h
deleted file mode 100644
index e6bc1031..00000000
--- a/tests/auto/quick3d_lancelot/shared/baselineprotocol.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef BASELINEPROTOCOL_H
-#define BASELINEPROTOCOL_H
-
-#include <QDataStream>
-#include <QTcpSocket>
-#include <QImage>
-#include <QVector>
-#include <QMap>
-#include <QPointer>
-#include <QStringList>
-
-#define QLS QLatin1String
-#define QLC QLatin1Char
-
-#define FileFormat "png"
-
-extern const QString PI_Project;
-extern const QString PI_TestCase;
-extern const QString PI_HostName;
-extern const QString PI_HostAddress;
-extern const QString PI_OSName;
-extern const QString PI_OSVersion;
-extern const QString PI_QtVersion;
-extern const QString PI_QtBuildMode;
-extern const QString PI_GitCommit;
-extern const QString PI_QMakeSpec;
-extern const QString PI_PulseGitBranch;
-extern const QString PI_PulseTestrBranch;
-
-class PlatformInfo : public QMap<QString, QString>
-{
-public:
-    PlatformInfo();
-    PlatformInfo(const PlatformInfo &other);
-    ~PlatformInfo()
-    {}
-    PlatformInfo &operator=(const PlatformInfo &other);
-
-    static PlatformInfo localHostInfo();
-
-    void addOverride(const QString& key, const QString& value);
-    QStringList overrides() const;
-    bool isAdHocRun() const;
-    void setAdHocRun(bool isAdHoc);
-
-private:
-    QStringList orides;
-    bool adHoc;
-    friend QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi);
-    friend QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
-};
-QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi);
-QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
-
-
-struct ImageItem
-{
-public:
-    ImageItem()
-        : status(Ok), itemChecksum(0)
-    {}
-    ImageItem(const ImageItem &other)
-    { *this = other; }
-    ~ImageItem()
-    {}
-    ImageItem &operator=(const ImageItem &other);
-
-    static quint64 computeChecksum(const QImage& image);
-
-    enum ItemStatus {
-        Ok = 0,
-        BaselineNotFound = 1,
-        IgnoreItem = 2,
-        Mismatch = 3,
-        FuzzyMatch = 4,
-        Error = 5
-    };
-
-    QString testFunction;
-    QString itemName;
-    ItemStatus status;
-    QImage image;
-    QList<quint64> imageChecksums;
-    quint16 itemChecksum;
-    QByteArray misc;
-
-    void writeImageToStream(QDataStream &stream) const;
-    void readImageFromStream(QDataStream &stream);
-};
-QDataStream & operator<< (QDataStream &stream, const ImageItem &ii);
-QDataStream & operator>> (QDataStream &stream, ImageItem& ii);
-
-Q_DECLARE_METATYPE(ImageItem);
-
-typedef QVector<ImageItem> ImageItemList;
-
-
-class BaselineProtocol
-{
-public:
-    BaselineProtocol();
-    ~BaselineProtocol();
-
-    static BaselineProtocol *instance(QObject *parent = 0);
-
-    // ****************************************************
-    // Important constants here
-    // ****************************************************
-    enum Constant {
-        ProtocolVersion = 5,
-        ServerPort = 54129,
-        Timeout = 15000
-    };
-
-    enum Command {
-        UnknownError = 0,
-        // Queries
-        AcceptPlatformInfo = 1,
-        RequestBaselineChecksums = 2,
-        AcceptMatch = 3,
-        AcceptNewBaseline = 4,
-        AcceptMismatch = 5,
-        // Responses
-        Ack = 128,
-        Abort = 129,
-        DoDryRun = 130,
-        FuzzyMatch = 131
-    };
-
-    // For client:
-
-    // For advanced client:
-    bool connect(const QString &testCase, bool *dryrun = 0, const PlatformInfo& clientInfo = PlatformInfo());
-    bool disconnect();
-    bool requestBaselineChecksums(const QString &testFunction, ImageItemList *itemList);
-    bool submitMatch(const ImageItem &item, QByteArray *serverMsg);
-    bool submitNewBaseline(const ImageItem &item, QByteArray *serverMsg);
-    bool submitMismatch(const ImageItem &item, QByteArray *serverMsg, bool *fuzzyMatch = 0);
-
-    // For server:
-    bool acceptConnection(PlatformInfo *pi);
-
-    QString errorMessage();
-
-private:
-    bool sendItem(Command cmd, const ImageItem &item);
-
-    bool sendBlock(Command cmd, const QByteArray &block);
-    bool receiveBlock(Command *cmd, QByteArray *block);
-
-    QString errMsg;
-    QTcpSocket socket;
-
-    friend class BaselineThread;
-    friend class BaselineHandler;
-};
-
-
-#endif // BASELINEPROTOCOL_H
diff --git a/tests/auto/quick3d_lancelot/shared/baselineprotocol.pri b/tests/auto/quick3d_lancelot/shared/baselineprotocol.pri
deleted file mode 100644
index 996f9d5a..00000000
--- a/tests/auto/quick3d_lancelot/shared/baselineprotocol.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDEPATH += $$PWD
-
-QT *= network
-
-SOURCES += \
-        $$PWD/baselineprotocol.cpp \
-        $$PWD/lookup3.cpp
-
-HEADERS += \
-        $$PWD/baselineprotocol.h
diff --git a/tests/auto/quick3d_lancelot/shared/lookup3.cpp b/tests/auto/quick3d_lancelot/shared/lookup3.cpp
deleted file mode 100644
index 33d27bd9..00000000
--- a/tests/auto/quick3d_lancelot/shared/lookup3.cpp
+++ /dev/null
@@ -1,821 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-
-/*
-These functions are based on:
-
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
-are externally useful functions.  Routines to test the hash are included
-if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-the public domain.  It has no warranty.
-
-You probably want to use hashlittle().  hashlittle() and hashbig()
-hash byte arrays.  hashlittle() is is faster than hashbig() on
-little-endian machines.  Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
-  a = i1;  b = i2;  c = i3;
-  mix(a,b,c);
-  a += i4; b += i5; c += i6;
-  mix(a,b,c);
-  a += i7;
-  final(a,b,c);
-then use c as the hash value.  If you have a variable length array of
-4-byte integers to hash, use hashword().  If you have a byte array (like
-a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().
-
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
-then mix those integers.  This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-
-#include <QtGlobal>
-
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#else
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#endif
-
-#define hashsize(n) ((quint32)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or
-  all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
-    4  6  8 16 19  4
-    9 15  3 18 27 15
-   14  9  3  7 17  3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche.  There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a.  The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism.  Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism.  I did what I could.  Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different.  This was tested for
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or
-  all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
-  4  8 15 26 3 22 24
- 10  8 15 26 3 22 24
- 11  8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
-
-/*
---------------------------------------------------------------------
- This works on all machines.  To be useful, it requires
- -- that the key be an array of quint32's, and
- -- that the length be the number of quint32's in the key
-
- The function hashword() is identical to hashlittle() on little-endian
- machines, and identical to hashbig() on big-endian machines,
- except that the length has to be measured in quint32s rather than in
- bytes.  hashlittle() is more complicated than hashword() only because
- hashlittle() has to dance around fitting the key bytes into registers.
---------------------------------------------------------------------
-*/
-quint32 hashword(
-const quint32 *k,                   /* the key, an array of quint32 values */
-size_t          length,               /* the length of the key, in quint32s */
-quint32        initval)         /* the previous hash, or an arbitrary value */
-{
-  quint32 a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + (((quint32)length)<<2) + initval;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 quint32's */
-  switch (length)                     /* all the case statements fall through */
-  {
-  case 3 : c+=k[2];
-           Q_FALLTHROUGH();
-  case 2 : b+=k[1];
-           Q_FALLTHROUGH();
-  case 1 : a+=k[0];
-           final(a,b,c);
-           Q_FALLTHROUGH();
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  return c;
-}
-
-
-/*
---------------------------------------------------------------------
-hashword2() -- same as hashword(), but take two seeds and return two
-32-bit values.  pc and pb must both be nonnull, and *pc and *pb must
-both be initialized with seeds.  If you pass in (*pb)==0, the output
-(*pc) will be the same as the return value from hashword().
---------------------------------------------------------------------
-*/
-void hashword2 (
-const quint32 *k,                   /* the key, an array of quint32 values */
-size_t          length,               /* the length of the key, in quint32s */
-quint32       *pc,                      /* IN: seed OUT: primary hash value */
-quint32       *pb)               /* IN: more seed OUT: secondary hash value */
-{
-  quint32 a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((quint32)(length<<2)) + *pc;
-  c += *pb;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 quint32's */
-  switch (length)                     /* all the case statements fall through */
-  {
-  case 3 : c+=k[2];
-           Q_FALLTHROUGH();
-  case 2 : b+=k[1];
-           Q_FALLTHROUGH();
-  case 1 : a+=k[0];
-    final(a,b,c);
-           Q_FALLTHROUGH();
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  *pc=c; *pb=b;
-}
-
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
-  k       : the key (the unaligned variable-length array of bytes)
-  length  : the length of the key, counting by bytes
-  initval : can be any 4-byte value
-Returns a 32-bit value.  Every bit of the key affects every bit of
-the return value.  Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (quint8 **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-
-By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
-code any way you wish, private, educational, or commercial.  It's free.
-
-Use for hash table lookup, or anything where one collision in 2^^32 is
-acceptable.  Do NOT use for cryptographic purposes.
--------------------------------------------------------------------------------
-*/
-
-quint32 hashlittle( const void *key, size_t length, quint32 initval)
-{
-  quint32 a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((quint32)length) + initval;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const quint32 *k = (const quint32 *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch (length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    const quint8  *k8 = (const quint8 *)k;
-    switch (length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((quint32)k8[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k8[9])<<8;
-             Q_FALLTHROUGH();
-    case 9 : c+=k8[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((quint32)k8[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k8[5])<<8;
-             Q_FALLTHROUGH();
-    case 5 : b+=k8[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((quint32)k8[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k8[1])<<8;
-             Q_FALLTHROUGH();
-    case 1 : a+=k8[0]; break;
-    case 0 : return c;
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const quint16 *k = (const quint16 *)key;         /* read 16-bit chunks */
-    const quint8  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((quint32)k[1])<<16);
-      b += k[2] + (((quint32)k[3])<<16);
-      c += k[4] + (((quint32)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const quint8 *)k;
-    switch (length)
-    {
-    case 12: c+=k[4]+(((quint32)k[5])<<16);
-             b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 11: c+=((quint32)k8[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=k[4];
-             b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 7 : b+=((quint32)k8[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=k[2];
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 3 : a+=((quint32)k8[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return c;                     /* zero length requires no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const quint8 *k = (const quint8 *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((quint32)k[1])<<8;
-      a += ((quint32)k[2])<<16;
-      a += ((quint32)k[3])<<24;
-      b += k[4];
-      b += ((quint32)k[5])<<8;
-      b += ((quint32)k[6])<<16;
-      b += ((quint32)k[7])<<24;
-      c += k[8];
-      c += ((quint32)k[9])<<8;
-      c += ((quint32)k[10])<<16;
-      c += ((quint32)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch (length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((quint32)k[11])<<24;
-             Q_FALLTHROUGH();
-    case 11: c+=((quint32)k[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k[9])<<8;
-             Q_FALLTHROUGH();
-    case 9 : c+=k[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=((quint32)k[7])<<24;
-             Q_FALLTHROUGH();
-    case 7 : b+=((quint32)k[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k[5])<<8;
-             Q_FALLTHROUGH();
-    case 5 : b+=k[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=((quint32)k[3])<<24;
-             Q_FALLTHROUGH();
-    case 3 : a+=((quint32)k[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k[1])<<8;
-             Q_FALLTHROUGH();
-    case 1 : a+=k[0];
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-/*
- * hashlittle2: return 2 32-bit hash values
- *
- * This is identical to hashlittle(), except it returns two 32-bit hash
- * values instead of just one.  This is good enough for hash table
- * lookup with 2^^64 buckets, or if you want a second hash if you're not
- * happy with the first, or if you want a probably-unique 64-bit ID for
- * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
- * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
- */
-void hashlittle2(
-  const void *key,       /* the key to hash */
-  size_t      length,    /* length of the key */
-  quint32   *pc,        /* IN: primary initval, OUT: primary hash */
-  quint32   *pb)        /* IN: secondary initval, OUT: secondary hash */
-{
-  quint32 a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((quint32)length) + *pc;
-  c += *pb;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const quint32 *k = (const quint32 *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch (length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    const quint8  *k8 = (const quint8 *)k;
-    switch (length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((quint32)k8[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k8[9])<<8;
-             Q_FALLTHROUGH();
-    case 9 : c+=k8[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((quint32)k8[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k8[5])<<8;
-             Q_FALLTHROUGH();
-    case 5 : b+=k8[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((quint32)k8[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k8[1])<<8;
-             Q_FALLTHROUGH();
-    case 1 : a+=k8[0]; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const quint16 *k = (const quint16 *)key;         /* read 16-bit chunks */
-    const quint8  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((quint32)k[1])<<16);
-      b += k[2] + (((quint32)k[3])<<16);
-      c += k[4] + (((quint32)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const quint8 *)k;
-    switch (length)
-    {
-    case 12: c+=k[4]+(((quint32)k[5])<<16);
-             b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 11: c+=((quint32)k8[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=k[4];
-             b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=k[2]+(((quint32)k[3])<<16);
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 7 : b+=((quint32)k8[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=k[2];
-             a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=k[0]+(((quint32)k[1])<<16);
-             break;
-    case 3 : a+=((quint32)k8[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const quint8 *k = (const quint8 *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((quint32)k[1])<<8;
-      a += ((quint32)k[2])<<16;
-      a += ((quint32)k[3])<<24;
-      b += k[4];
-      b += ((quint32)k[5])<<8;
-      b += ((quint32)k[6])<<16;
-      b += ((quint32)k[7])<<24;
-      c += k[8];
-      c += ((quint32)k[9])<<8;
-      c += ((quint32)k[10])<<16;
-      c += ((quint32)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch (length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((quint32)k[11])<<24;
-             Q_FALLTHROUGH();
-    case 11: c+=((quint32)k[10])<<16;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k[9])<<8;
-             Q_FALLTHROUGH();
-    case 9 : c+=k[8];
-             Q_FALLTHROUGH();
-    case 8 : b+=((quint32)k[7])<<24;
-             Q_FALLTHROUGH();
-    case 7 : b+=((quint32)k[6])<<16;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k[5])<<8;
-             Q_FALLTHROUGH();
-    case 5 : b+=k[4];
-             Q_FALLTHROUGH();
-    case 4 : a+=((quint32)k[3])<<24;
-             Q_FALLTHROUGH();
-    case 3 : a+=((quint32)k[2])<<16;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k[1])<<8;
-             Q_FALLTHROUGH();
-    case 1 : a+=k[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-  }
-
-  final(a,b,c);
-  *pc=c; *pb=b;
-}
-
-
-
-/*
- * hashbig():
- * This is the same as hashword() on big-endian machines.  It is different
- * from hashlittle() on all machines.  hashbig() takes advantage of
- * big-endian byte ordering.
- */
-quint32 hashbig( const void *key, size_t length, quint32 initval)
-{
-  quint32 a,b,c;
-  union { const void *ptr; size_t i; } u; /* to cast key to (size_t) happily */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((quint32)length) + initval;
-
-  u.ptr = key;
-  if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
-    const quint32 *k = (const quint32 *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]<<8" actually reads beyond the end of the string, but
-     * then shifts out the part it's not allowed to read.  Because the
-     * string is aligned, the illegal read is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch (length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff00; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff0000; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff000000; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff00; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff0000; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff000000; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff00; break;
-    case 2 : a+=k[0]&0xffff0000; break;
-    case 1 : a+=k[0]&0xff000000; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else  /* make valgrind happy */
-
-    const quint8 *k8 = (const quint8 *)k;
-    switch (length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((quint32)k8[10])<<8;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k8[9])<<16;
-             Q_FALLTHROUGH();
-    case 9 : c+=((quint32)k8[8])<<24;
-             Q_FALLTHROUGH();
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((quint32)k8[6])<<8;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k8[5])<<16;
-             Q_FALLTHROUGH();
-    case 5 : b+=((quint32)k8[4])<<24;
-             Q_FALLTHROUGH();
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((quint32)k8[2])<<8;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k8[1])<<16;
-             Q_FALLTHROUGH();
-    case 1 : a+=((quint32)k8[0])<<24; break;
-    case 0 : return c;
-    }
-
-#endif /* !VALGRIND */
-
-  } else {                        /* need to read the key one byte at a time */
-    const quint8 *k = (const quint8 *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += ((quint32)k[0])<<24;
-      a += ((quint32)k[1])<<16;
-      a += ((quint32)k[2])<<8;
-      a += ((quint32)k[3]);
-      b += ((quint32)k[4])<<24;
-      b += ((quint32)k[5])<<16;
-      b += ((quint32)k[6])<<8;
-      b += ((quint32)k[7]);
-      c += ((quint32)k[8])<<24;
-      c += ((quint32)k[9])<<16;
-      c += ((quint32)k[10])<<8;
-      c += ((quint32)k[11]);
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch (length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[11];
-             Q_FALLTHROUGH();
-    case 11: c+=((quint32)k[10])<<8;
-             Q_FALLTHROUGH();
-    case 10: c+=((quint32)k[9])<<16;
-             Q_FALLTHROUGH();
-    case 9 : c+=((quint32)k[8])<<24;
-             Q_FALLTHROUGH();
-    case 8 : b+=k[7];
-             Q_FALLTHROUGH();
-    case 7 : b+=((quint32)k[6])<<8;
-             Q_FALLTHROUGH();
-    case 6 : b+=((quint32)k[5])<<16;
-             Q_FALLTHROUGH();
-    case 5 : b+=((quint32)k[4])<<24;
-             Q_FALLTHROUGH();
-    case 4 : a+=k[3];
-             Q_FALLTHROUGH();
-    case 3 : a+=((quint32)k[2])<<8;
-             Q_FALLTHROUGH();
-    case 2 : a+=((quint32)k[1])<<16;
-             Q_FALLTHROUGH();
-    case 1 : a+=((quint32)k[0])<<24;
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
diff --git a/tests/auto/quick3d_lancelot/shared/qbaselinetest.cpp b/tests/auto/quick3d_lancelot/shared/qbaselinetest.cpp
deleted file mode 100644
index 408f5ea2..00000000
--- a/tests/auto/quick3d_lancelot/shared/qbaselinetest.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "qbaselinetest.h"
-#include "baselineprotocol.h"
-#if QT_CONFIG(process)
-# include <QtCore/QProcess>
-#endif
-#include <QtCore/QDir>
-
-#define MAXCMDLINEARGS 128
-
-namespace QBaselineTest {
-
-static char *fargv[MAXCMDLINEARGS];
-static bool simfail = false;
-static PlatformInfo customInfo;
-static bool customAutoModeSet = false;
-
-static BaselineProtocol proto;
-static bool connected = false;
-static bool triedConnecting = false;
-static bool dryRunMode = false;
-static enum { UploadMissing, UploadAll, UploadNone } baselinePolicy = UploadMissing;
-static bool abortIfUnstable = true;
-
-static QByteArray curFunction;
-static ImageItemList itemList;
-static bool gotBaselines;
-
-static QString definedTestProject;
-static QString definedTestCase;
-
-
-void handleCmdLineArgs(int *argcp, char ***argvp)
-{
-    if (!argcp || !argvp)
-        return;
-
-    bool showHelp = false;
-
-    int fargc = 0;
-    int numArgs = *argcp;
-
-    for (int i = 0; i < numArgs; i++) {
-        QByteArray arg = (*argvp)[i];
-        QByteArray nextArg = (i+1 < numArgs) ? (*argvp)[i+1] : nullptr;
-
-        if (arg == "-simfail") {
-            simfail = true;
-        } else if (arg == "-fuzzlevel") {
-            i++;
-            bool ok = false;
-            (void)nextArg.toInt(&ok);
-            if (!ok) {
-                qWarning() << "-fuzzlevel requires integer parameter";
-                showHelp = true;
-                break;
-            }
-            customInfo.insert("FuzzLevel", QString::fromLatin1(nextArg));
-        } else if (arg == "-auto") {
-            customAutoModeSet = true;
-            customInfo.setAdHocRun(false);
-        } else if (arg == "-adhoc") {
-            customAutoModeSet = true;
-            customInfo.setAdHocRun(true);
-        } else if (arg == "-setbaselines") {
-            baselinePolicy = UploadAll;
-        } else if (arg == "-keeprunning") {
-            abortIfUnstable = false;
-        } else if (arg == "-nosetbaselines") {
-            baselinePolicy = UploadNone;
-        } else if (arg == "-compareto") {
-            i++;
-            int split = qMax(0, nextArg.indexOf('='));
-            QByteArray key = nextArg.left(split).trimmed();
-            QByteArray value = nextArg.mid(split+1).trimmed();
-            if (key.isEmpty() || value.isEmpty()) {
-                qWarning() << "-compareto requires parameter of the form <key>=<value>";
-                showHelp = true;
-                break;
-            }
-            customInfo.addOverride(key, value);
-        } else {
-            if ( (arg == "-help") || (arg == "--help") )
-                showHelp = true;
-            if (fargc >= MAXCMDLINEARGS) {
-                qWarning() << "Too many command line arguments!";
-                break;
-            }
-            fargv[fargc++] = (*argvp)[i];
-        }
-    }
-    *argcp = fargc;
-    *argvp = fargv;
-
-    if (showHelp) {
-        // TBD: arrange for this to be printed *after* QTest's help
-        QTextStream out(stdout);
-        out << "\n Baseline testing (lancelot) options:\n";
-        out << " -simfail            : Force an image comparison mismatch. For testing purposes.\n";
-        out << " -fuzzlevel <int>    : Specify the percentage of fuzziness in comparison. Overrides server default. 0 means exact match.\n";
-        out << " -auto               : Inform server that this run is done by a daemon, CI system or similar.\n";
-        out << " -adhoc (default)    : The inverse of -auto; this run is done by human, e.g. for testing.\n";
-        out << " -keeprunning        : Run all tests even if the system is unstable \n";
-        out << " -setbaselines       : Store ALL rendered images as new baselines. Forces replacement of previous baselines.\n";
-        out << " -nosetbaselines     : Do not store rendered images as new baselines when previous baselines are missing.\n";
-        out << " -compareto KEY=VAL  : Force comparison to baselines from a different client,\n";
-        out << "                       for example: -compareto QtVersion=4.8.0\n";
-        out << "                       Multiple -compareto client specifications may be given.\n";
-        out << "\n";
-    }
-}
-
-bool shouldAbortIfUnstable()
-{
-    return abortIfUnstable;
-}
-
-void addClientProperty(const QString& key, const QString& value)
-{
-    customInfo.insert(key, value);
-}
-
-
-/*
-  If a client property script is present, run it and accept its output
-  in the form of one 'key: value' property per line
-*/
-void fetchCustomClientProperties()
-{
-    QFile file("hostinfo.txt");
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-        return;
-    QTextStream in(&file);
-
-    while (!in.atEnd()) {
-        QString line = in.readLine().trimmed();   // ###local8bit? utf8?
-        if (line.startsWith(QLatin1Char('#')))  // Ignore comments in file
-            continue;
-        QString key, val;
-        int colonPos = line.indexOf(':');
-        if (colonPos > 0) {
-            key = line.left(colonPos).simplified().replace(' ', '_');
-            val = line.mid(colonPos+1).trimmed();
-        }
-        if (!key.isEmpty() && key.length() < 64 && val.length() < 256)  // ###TBD: maximum 256 chars in value?
-            addClientProperty(key, val);
-        else
-            qDebug() << "Unparseable script output ignored:" << line;
-    }
-    file.close();
-}
-
-
-bool connect(QByteArray *msg, bool *error)
-{
-    if (connected) {
-        return true;
-    }
-    else if (triedConnecting) {
-        // Avoid repeated connection attempts, to avoid the program using Timeout * #testItems seconds before giving up
-        *msg = "Not connected to baseline server.";
-        *error = true;
-        return false;
-    }
-
-    triedConnecting = true;
-    fetchCustomClientProperties();
-    // Merge the platform info set by the program with the protocols default info
-    PlatformInfo clientInfo = customInfo;
-    PlatformInfo defaultInfo = PlatformInfo::localHostInfo();
-    const auto &defaultInfoKeys = defaultInfo.keys();
-    for (const QString &key : defaultInfoKeys) {
-        if (!clientInfo.contains(key))
-            clientInfo.insert(key, defaultInfo.value(key));
-    }
-    if (!customAutoModeSet)
-        clientInfo.setAdHocRun(defaultInfo.isAdHocRun());
-
-    if (!definedTestProject.isEmpty())
-        clientInfo.insert(PI_Project, definedTestProject);
-
-    QString testCase = definedTestCase;
-    if (testCase.isEmpty() && QTest::testObject() && QTest::testObject()->metaObject()) {
-        //qDebug() << "Trying to Read TestCaseName from Testlib!";
-        testCase = QTest::testObject()->metaObject()->className();
-    }
-    if (testCase.isEmpty()) {
-        qWarning("QBaselineTest::connect: No test case name specified, cannot connect.");
-        return false;
-    }
-
-    if (!proto.connect(testCase, &dryRunMode, clientInfo)) {
-        *msg += "Failed to connect to baseline server: " + proto.errorMessage().toLatin1();
-        *error = true;
-        return false;
-    }
-    connected = true;
-    return true;
-}
-
-bool disconnectFromBaselineServer()
-{
-    if (proto.disconnect()) {
-        connected = false;
-        triedConnecting = false;
-        return true;
-    }
-
-    return false;
-}
-
-bool connectToBaselineServer(QByteArray *msg, const QString &testProject, const QString &testCase)
-{
-    bool dummy;
-    QByteArray dummyMsg;
-
-    definedTestProject = testProject;
-    definedTestCase = testCase;
-
-    return connect(msg ? msg : &dummyMsg, &dummy);
-}
-
-void setAutoMode(bool mode)
-{
-    customInfo.setAdHocRun(!mode);
-    customAutoModeSet = true;
-}
-
-void setSimFail(bool fail)
-{
-    simfail = fail;
-}
-
-
-void modifyImage(QImage *img)
-{
-    uint c0 = 0x0000ff00;
-    uint c1 = 0x0080ff00;
-    img->setPixel(1,1,c0);
-    img->setPixel(2,1,c1);
-    img->setPixel(3,1,c0);
-    img->setPixel(1,2,c1);
-    img->setPixel(1,3,c0);
-    img->setPixel(2,3,c1);
-    img->setPixel(3,3,c0);
-    img->setPixel(1,4,c1);
-    img->setPixel(1,5,c0);
-}
-
-
-bool compareItem(const ImageItem &baseline, const QImage &img, QByteArray *msg, bool *error)
-{
-    ImageItem item = baseline;
-    if (simfail) {
-        // Simulate test failure by forcing image mismatch; for testing purposes
-        QImage misImg = img;
-        modifyImage(&misImg);
-        item.image = misImg;
-        simfail = false;                      // One failure is typically enough
-    } else {
-        item.image = img;
-    }
-    item.imageChecksums.clear();
-    item.imageChecksums.prepend(ImageItem::computeChecksum(item.image));
-    QByteArray srvMsg;
-    switch (baseline.status) {
-    case ImageItem::Ok:
-        break;
-    case ImageItem::IgnoreItem :
-        qDebug() << msg->constData() << "Ignored, blacklisted on server.";
-        return true;
-    case ImageItem::BaselineNotFound:
-        if (!customInfo.overrides().isEmpty() || baselinePolicy == UploadNone) {
-            qWarning() << "Cannot compare to baseline: No such baseline found on server.";
-            return true;
-        }
-        if (proto.submitNewBaseline(item, &srvMsg))
-            qDebug() << msg->constData() << "Baseline not found on server. New baseline uploaded.";
-        else
-            qDebug() << msg->constData() << "Baseline not found on server. Uploading of new baseline failed:" << srvMsg;
-        return true;
-    default:
-        qWarning() << "Unexpected reply from baseline server.";
-        return true;
-    }
-    *error = false;
-    // The actual comparison of the given image with the baseline:
-    if (baseline.imageChecksums.contains(item.imageChecksums.at(0))) {
-        if (!proto.submitMatch(item, &srvMsg))
-            qWarning() << "Failed to report image match to server:" << srvMsg;
-        return true;
-    }
-    // At this point, we have established a legitimate mismatch
-    if (baselinePolicy == UploadAll) {
-        if (proto.submitNewBaseline(item, &srvMsg))
-            qDebug() << msg->constData() << "Forcing new baseline; uploaded ok.";
-        else
-            qDebug() << msg->constData() << "Forcing new baseline; uploading failed:" << srvMsg;
-        return true;
-    }
-    bool fuzzyMatch = false;
-    bool res = proto.submitMismatch(item, &srvMsg, &fuzzyMatch);
-    if (res && fuzzyMatch) {
-        qInfo() << "Baseline server reports:" << srvMsg;
-        return true;            // The server decides: a fuzzy match means no mismatch
-    }
-    *msg += "Mismatch. See report:\n   " + srvMsg;
-    if (dryRunMode) {
-        qDebug() << "Dryrun, so ignoring" << *msg;
-        return true;
-    }
-    return false;
-}
-
-bool checkImage(const QImage &img, const char *name, quint16 checksum, QByteArray *msg, bool *error, int manualdatatag)
-{
-    if (!connected && !connect(msg, error))
-        return true;
-
-    QByteArray itemName;
-    bool hasName = qstrlen(name);
-
-    const char *tag = QTest::currentDataTag();
-    if (qstrlen(tag)) {
-        itemName = tag;
-        if (hasName)
-            itemName.append('_').append(name);
-    } else {
-            itemName = hasName ? name : "default_name";
-    }
-
-    if (manualdatatag > 0)
-    {
-        itemName.prepend("_");
-        itemName.prepend(QByteArray::number(manualdatatag));
-    }
-
-    *msg = "Baseline check of image '" + itemName + "': ";
-
-
-    ImageItem item;
-    item.itemName = QString::fromLatin1(itemName);
-    item.itemChecksum = checksum;
-    item.testFunction = QString::fromLatin1(QTest::currentTestFunction());
-    ImageItemList list;
-    list.append(item);
-    if (!proto.requestBaselineChecksums(QLatin1String(QTest::currentTestFunction()), &list) || list.isEmpty()) {
-        *msg = "Communication with baseline server failed: " + proto.errorMessage().toLatin1();
-        *error = true;
-        return true;
-    }
-
-    return compareItem(list.at(0), img, msg, error);
-}
-
-
-QTestData &newRow(const char *dataTag, quint16 checksum)
-{
-    if (QTest::currentTestFunction() != curFunction) {
-        curFunction = QTest::currentTestFunction();
-        itemList.clear();
-        gotBaselines = false;
-    }
-    ImageItem item;
-    item.itemName = QString::fromLatin1(dataTag);
-    item.itemChecksum = checksum;
-    item.testFunction = QString::fromLatin1(QTest::currentTestFunction());
-    itemList.append(item);
-
-    return QTest::newRow(dataTag);
-}
-
-
-bool testImage(const QImage& img, QByteArray *msg, bool *error)
-{
-    if (!connected && !connect(msg, error))
-        return true;
-
-    if (QTest::currentTestFunction() != curFunction || itemList.isEmpty()) {
-        qWarning() << "Usage error: QBASELINE_TEST used without corresponding QBaselineTest::newRow()";
-        return true;
-    }
-
-    if (!gotBaselines) {
-        if (!proto.requestBaselineChecksums(QString::fromLatin1(QTest::currentTestFunction()), &itemList) || itemList.isEmpty()) {
-            *msg = "Communication with baseline server failed: " + proto.errorMessage().toLatin1();
-            *error = true;
-            return true;
-        }
-        gotBaselines = true;
-    }
-
-    QString curTag = QString::fromLatin1(QTest::currentDataTag());
-    ImageItemList::const_iterator it = itemList.constBegin();
-    while (it != itemList.constEnd() && it->itemName != curTag)
-        ++it;
-    if (it == itemList.constEnd()) {
-        qWarning() << "Usage error: QBASELINE_TEST used without corresponding QBaselineTest::newRow() for row" << curTag;
-        return true;
-    }
-    return compareItem(*it, img, msg, error);
-}
-
-}
diff --git a/tests/auto/quick3d_lancelot/shared/qbaselinetest.h b/tests/auto/quick3d_lancelot/shared/qbaselinetest.h
deleted file mode 100644
index cb0c49fc..00000000
--- a/tests/auto/quick3d_lancelot/shared/qbaselinetest.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#ifndef BASELINETEST_H
-#define BASELINETEST_H
-
-#include <QTest>
-#include <QString>
-
-namespace QBaselineTest {
-void setAutoMode(bool mode);
-void setSimFail(bool fail);
-void handleCmdLineArgs(int *argcp, char ***argvp);
-void addClientProperty(const QString& key, const QString& value);
-bool connectToBaselineServer(QByteArray *msg = 0, const QString &testProject = QString(), const QString &testCase = QString());
-bool checkImage(const QImage& img, const char *name, quint16 checksum, QByteArray *msg, bool *error, int manualdatatag = 0);
-bool testImage(const QImage& img, QByteArray *msg, bool *error);
-QTestData &newRow(const char *dataTag, quint16 checksum = 0);
-bool disconnectFromBaselineServer();
-bool shouldAbortIfUnstable();
-}
-
-#define QBASELINE_CHECK_SUM(image, name, checksum)\
-do {\
-    QByteArray _msg;\
-    bool _err = false;\
-    if (!QBaselineTest::checkImage((image), (name), (checksum), &_msg, &_err)) {\
-        QFAIL(_msg.constData());\
-    } else if (_err) {\
-        QSKIP(_msg.constData());\
-    }\
-} while (0)
-
-#define QBASELINE_CHECK(image, name) QBASELINE_CHECK_SUM(image, name, 0)
-
-#define QBASELINE_TEST(image)\
-do {\
-    QByteArray _msg;\
-    bool _err = false;\
-    if (!QBaselineTest::testImage((image), &_msg, &_err)) {\
-        QFAIL(_msg.constData());\
-    } else if (_err) {\
-        QSKIP(_msg.constData());\
-    }\
-} while (0)
-
-#endif // BASELINETEST_H
diff --git a/tests/auto/quick3d_lancelot/shared/qbaselinetest.pri b/tests/auto/quick3d_lancelot/shared/qbaselinetest.pri
deleted file mode 100644
index 921871b1..00000000
--- a/tests/auto/quick3d_lancelot/shared/qbaselinetest.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT *= testlib
-
-SOURCES += \
-        $$PWD/qbaselinetest.cpp
-
-HEADERS += \
-        $$PWD/qbaselinetest.h
-
-win32:MKSPEC=$$replace(QMAKESPEC, \\\\, /)
-else:MKSPEC=$$QMAKESPEC
-DEFINES += QMAKESPEC=\\\"$$MKSPEC\\\"
-
-include($$PWD/baselineprotocol.pri)
diff --git a/tests/baseline/CMakeLists.txt b/tests/baseline/CMakeLists.txt
new file mode 100644
index 00000000..7dac65e3
--- /dev/null
+++ b/tests/baseline/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Generated from quick3d_lancelot.pro.
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qquick3d LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+# Special case: test includes the QBaselineTest module sources from qtbase directly
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../qtbase/tests/baseline/shared")
+    add_subdirectory(scenegrabber)
+    add_subdirectory(quick3d)
+endif()
diff --git a/tests/auto/quick3d_lancelot/INSTRUCTIONS.txt b/tests/baseline/INSTRUCTIONS.txt
index 5a6cb2d4..6273821b 100644
--- a/tests/auto/quick3d_lancelot/INSTRUCTIONS.txt
+++ b/tests/baseline/INSTRUCTIONS.txt
@@ -5,27 +5,23 @@ images with the images produced from a previous rendering run.
 
 Here are instructions for running lancelot tests locally on your PC:
 
-1. Build lancelot baselineserver.
-- cd [your qt5 path]\qtbase\tests\baselineserver\src\
-- qmake
-- jom (or make or nmake)
+1. Install baselineserver :
+- clone git.qt.io:playground/lancelot.git
+- check [lancelot]/baselineserver/install/install.txt for installation guide
 
 2. Start lancelot baselineserver and leave it running.
-- cd [your qt5 path]\qtbase\tests\baselineserver\bin\
-- baselineserver.exe
 
-3. With Qt Creator, open Quick3D lancelot tests project
-(qtquick3d\tests\auto\quick3d_lancelot\quick3d_lancelot.pro)
+3. Build QtQuick3D with QT_BUILD_TESTS flag ON
 
 4. In Creator Project Settings, set an environmental variable
 "QT_LANCELOT_SERVER" to "127.0.0.1".
 
-5. Run quick3d_lancelot for the first time and you should see many
+5. Run tst_Quick3D for the first time and you should see many
 "Baseline not found on server. New baseline uploaded." lines.
 Baseline PNG images will be stored into path like:
 C:\var\www\Other\tst_Quick3D\baselines\testRendering\
 
-6. Apply your changes, fixes etc. and run quick3d_lancelot test again.
+6. Apply your changes, fixes etc. and run tst_Quick3D test again.
 If rendering output doesn't change to better or worse, you should see
 something like:
 ...
diff --git a/tests/auto/quick3d_lancelot/data/Ignore b/tests/baseline/data/Ignore
index 3a9d5e71..3a9d5e71 100644
--- a/tests/auto/quick3d_lancelot/data/Ignore
+++ b/tests/baseline/data/Ignore
diff --git a/tests/auto/quick3d_lancelot/data/camera/ChildCamera.qml b/tests/baseline/data/camera/ChildCamera.qml
index 81235c90..81235c90 100644
--- a/tests/auto/quick3d_lancelot/data/camera/ChildCamera.qml
+++ b/tests/baseline/data/camera/ChildCamera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/ChildTransformCamera.qml b/tests/baseline/data/camera/ChildTransformCamera.qml
index ac01b2cc..ac01b2cc 100644
--- a/tests/auto/quick3d_lancelot/data/camera/ChildTransformCamera.qml
+++ b/tests/baseline/data/camera/ChildTransformCamera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/DefaultCamera.qml b/tests/baseline/data/camera/DefaultCamera.qml
index 0f9317f5..0f9317f5 100644
--- a/tests/auto/quick3d_lancelot/data/camera/DefaultCamera.qml
+++ b/tests/baseline/data/camera/DefaultCamera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/ExplicitlyHidden_camera.qml b/tests/baseline/data/camera/ExplicitlyHidden_camera.qml
index a04648d7..a04648d7 100644
--- a/tests/auto/quick3d_lancelot/data/camera/ExplicitlyHidden_camera.qml
+++ b/tests/baseline/data/camera/ExplicitlyHidden_camera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/OrbitCamera.qml b/tests/baseline/data/camera/OrbitCamera.qml
index 92903360..92903360 100644
--- a/tests/auto/quick3d_lancelot/data/camera/OrbitCamera.qml
+++ b/tests/baseline/data/camera/OrbitCamera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/Orthographic_camera.qml b/tests/baseline/data/camera/Orthographic_camera.qml
index a52ff93c..a52ff93c 100644
--- a/tests/auto/quick3d_lancelot/data/camera/Orthographic_camera.qml
+++ b/tests/baseline/data/camera/Orthographic_camera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/Perspective_camera.qml b/tests/baseline/data/camera/Perspective_camera.qml
index 23497813..23497813 100644
--- a/tests/auto/quick3d_lancelot/data/camera/Perspective_camera.qml
+++ b/tests/baseline/data/camera/Perspective_camera.qml
diff --git a/tests/auto/quick3d_lancelot/data/camera/Perspective_camera_scaled.qml b/tests/baseline/data/camera/Perspective_camera_scaled.qml
index 06eef62b..06eef62b 100644
--- a/tests/auto/quick3d_lancelot/data/camera/Perspective_camera_scaled.qml
+++ b/tests/baseline/data/camera/Perspective_camera_scaled.qml
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/dynamicgeometry.qml b/tests/baseline/data/customgeometry/dynamicgeometry.qml
index 7757c896..7757c896 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/dynamicgeometry.qml
+++ b/tests/baseline/data/customgeometry/dynamicgeometry.qml
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/indexedtrianglestopology.qml b/tests/baseline/data/customgeometry/indexedtrianglestopology.qml
index 4811cb1a..4811cb1a 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/indexedtrianglestopology.qml
+++ b/tests/baseline/data/customgeometry/indexedtrianglestopology.qml
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/nonindexedtrianglestopology.qml b/tests/baseline/data/customgeometry/nonindexedtrianglestopology.qml
index 6f40ed26..6f40ed26 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/nonindexedtrianglestopology.qml
+++ b/tests/baseline/data/customgeometry/nonindexedtrianglestopology.qml
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.frag b/tests/baseline/data/customgeometry/pointstopology.frag
index c8d7771d..c8d7771d 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.frag
+++ b/tests/baseline/data/customgeometry/pointstopology.frag
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.qml b/tests/baseline/data/customgeometry/pointstopology.qml
index df6aa4f6..df6aa4f6 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.qml
+++ b/tests/baseline/data/customgeometry/pointstopology.qml
diff --git a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.vert b/tests/baseline/data/customgeometry/pointstopology.vert
index 683694dc..683694dc 100644
--- a/tests/auto/quick3d_lancelot/data/customgeometry/pointstopology.vert
+++ b/tests/baseline/data/customgeometry/pointstopology.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/DepthDrawTestMaterial.qml b/tests/baseline/data/custommaterial/DepthDrawTestMaterial.qml
index 478804ef..478804ef 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/DepthDrawTestMaterial.qml
+++ b/tests/baseline/data/custommaterial/DepthDrawTestMaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/NoUniformsUnshadedMaterial.qml b/tests/baseline/data/custommaterial/NoUniformsUnshadedMaterial.qml
index 45980095..45980095 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/NoUniformsUnshadedMaterial.qml
+++ b/tests/baseline/data/custommaterial/NoUniformsUnshadedMaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/SkyboxIBL_custommaterial.qml b/tests/baseline/data/custommaterial/SkyboxIBL_custommaterial.qml
index cdd7b61c..cdd7b61c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/SkyboxIBL_custommaterial.qml
+++ b/tests/baseline/data/custommaterial/SkyboxIBL_custommaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.frag b/tests/baseline/data/custommaterial/basicskybox.frag
index b9a5f4a1..b9a5f4a1 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.frag
+++ b/tests/baseline/data/custommaterial/basicskybox.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.qml b/tests/baseline/data/custommaterial/basicskybox.qml
index 78cd3208..78cd3208 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.qml
+++ b/tests/baseline/data/custommaterial/basicskybox.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.vert b/tests/baseline/data/custommaterial/basicskybox.vert
index 20bc0c3e..20bc0c3e 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/basicskybox.vert
+++ b/tests/baseline/data/custommaterial/basicskybox.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/cubemap_as_2d.frag b/tests/baseline/data/custommaterial/cubemap_as_2d.frag
index b004434c..b004434c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/cubemap_as_2d.frag
+++ b/tests/baseline/data/custommaterial/cubemap_as_2d.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/cubemaptexture.frag b/tests/baseline/data/custommaterial/cubemaptexture.frag
index 322fe226..322fe226 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/cubemaptexture.frag
+++ b/tests/baseline/data/custommaterial/cubemaptexture.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/cubemaptexture.qml b/tests/baseline/data/custommaterial/cubemaptexture.qml
index 25515ef0..25515ef0 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/cubemaptexture.qml
+++ b/tests/baseline/data/custommaterial/cubemaptexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_depthDrawModes.qml b/tests/baseline/data/custommaterial/custom_depthDrawModes.qml
index a77d6b18..a77d6b18 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_depthDrawModes.qml
+++ b/tests/baseline/data/custommaterial/custom_depthDrawModes.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_depthDrawModes_prepass.qml b/tests/baseline/data/custommaterial/custom_depthDrawModes_prepass.qml
index 2c212a8b..2c212a8b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_depthDrawModes_prepass.qml
+++ b/tests/baseline/data/custommaterial/custom_depthDrawModes_prepass.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_ssao.frag b/tests/baseline/data/custommaterial/custom_ssao.frag
index 8397356f..8397356f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_ssao.frag
+++ b/tests/baseline/data/custommaterial/custom_ssao.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_ssao.vert b/tests/baseline/data/custommaterial/custom_ssao.vert
index ba1d35b0..ba1d35b0 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_ssao.vert
+++ b/tests/baseline/data/custommaterial/custom_ssao.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_depth.frag b/tests/baseline/data/custommaterial/custom_unshaded_depth.frag
index 8e9f5993..8e9f5993 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_depth.frag
+++ b/tests/baseline/data/custommaterial/custom_unshaded_depth.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_depth.vert b/tests/baseline/data/custommaterial/custom_unshaded_depth.vert
index f96f7995..f96f7995 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_depth.vert
+++ b/tests/baseline/data/custommaterial/custom_unshaded_depth.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_ssao.frag b/tests/baseline/data/custommaterial/custom_unshaded_ssao.frag
index 50572688..50572688 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_ssao.frag
+++ b/tests/baseline/data/custommaterial/custom_unshaded_ssao.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_ssao.vert b/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert
index 98e21e8a..98e21e8a 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custom_unshaded_ssao.vert
+++ b/tests/baseline/data/custommaterial/custom_unshaded_ssao.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customblend.frag b/tests/baseline/data/custommaterial/customblend.frag
index 3002f81c..3002f81c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customblend.frag
+++ b/tests/baseline/data/custommaterial/customblend.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customblend.qml b/tests/baseline/data/custommaterial/customblend.qml
index 1b845762..1b845762 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customblend.qml
+++ b/tests/baseline/data/custommaterial/customblend.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor.frag b/tests/baseline/data/custommaterial/customcolor.frag
index c1c9a72f..c1c9a72f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor.frag
+++ b/tests/baseline/data/custommaterial/customcolor.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor.qml b/tests/baseline/data/custommaterial/customcolor.qml
index a79de825..a79de825 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor.qml
+++ b/tests/baseline/data/custommaterial/customcolor.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor2.frag b/tests/baseline/data/custommaterial/customcolor2.frag
index c1c9a72f..c1c9a72f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor2.frag
+++ b/tests/baseline/data/custommaterial/customcolor2.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor2.vert b/tests/baseline/data/custommaterial/customcolor2.vert
index abb42da6..abb42da6 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customcolor2.vert
+++ b/tests/baseline/data/custommaterial/customcolor2.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffuse.frag b/tests/baseline/data/custommaterial/customdiffuse.frag
index 9f54953d..9f54953d 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffuse.frag
+++ b/tests/baseline/data/custommaterial/customdiffuse.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffuse.qml b/tests/baseline/data/custommaterial/customdiffuse.qml
index d1033a6f..d1033a6f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffuse.qml
+++ b/tests/baseline/data/custommaterial/customdiffuse.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.frag b/tests/baseline/data/custommaterial/customdiffusespecular.frag
index 2701a055..2701a055 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.frag
+++ b/tests/baseline/data/custommaterial/customdiffusespecular.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.qml b/tests/baseline/data/custommaterial/customdiffusespecular.qml
index be5d557b..be5d557b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.qml
+++ b/tests/baseline/data/custommaterial/customdiffusespecular.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.vert b/tests/baseline/data/custommaterial/customdiffusespecular.vert
index 5bd893c8..5bd893c8 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular.vert
+++ b/tests/baseline/data/custommaterial/customdiffusespecular.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.frag b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.frag
index f7b939ef..f7b939ef 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.frag
+++ b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.qml b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.qml
index 8cd972ac..8cd972ac 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.qml
+++ b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.vert b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert
index ba1d35b0..ba1d35b0 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customdiffusespecular_builtins.vert
+++ b/tests/baseline/data/custommaterial/customdiffusespecular_builtins.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe.frag b/tests/baseline/data/custommaterial/customlightprobe.frag
index 4fbaf7fa..4fbaf7fa 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe.frag
+++ b/tests/baseline/data/custommaterial/customlightprobe.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe.qml b/tests/baseline/data/custommaterial/customlightprobe.qml
index d7a34423..d7a34423 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe.qml
+++ b/tests/baseline/data/custommaterial/customlightprobe.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_light.qml b/tests/baseline/data/custommaterial/customlightprobe_light.qml
index 92286b61..92286b61 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_light.qml
+++ b/tests/baseline/data/custommaterial/customlightprobe_light.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_scope.qml b/tests/baseline/data/custommaterial/customlightprobe_scope.qml
index a67c8d66..a67c8d66 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_scope.qml
+++ b/tests/baseline/data/custommaterial/customlightprobe_scope.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_scope2.qml b/tests/baseline/data/custommaterial/customlightprobe_scope2.qml
index eaf140ee..eaf140ee 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customlightprobe_scope2.qml
+++ b/tests/baseline/data/custommaterial/customlightprobe_scope2.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ibl.frag b/tests/baseline/data/custommaterial/custommaterial_ibl.frag
index 6bce1aad..6bce1aad 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ibl.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_ibl.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ibl2.frag b/tests/baseline/data/custommaterial/custommaterial_ibl2.frag
index d7076b39..d7076b39 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ibl2.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_ibl2.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_keywords.qml b/tests/baseline/data/custommaterial/custommaterial_keywords.qml
index 3b151a40..3b151a40 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_keywords.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_keywords.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.frag b/tests/baseline/data/custommaterial/custommaterial_normals.frag
index 9097f4bf..9097f4bf 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_normals.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.qml b/tests/baseline/data/custommaterial/custommaterial_normals.qml
index cb19117b..cb19117b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_normals.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.vert b/tests/baseline/data/custommaterial/custommaterial_normals.vert
index 63d7f064..63d7f064 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_normals.vert
+++ b/tests/baseline/data/custommaterial/custommaterial_normals.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.frag b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.frag
index 4d5fde67..4d5fde67 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.qml b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.qml
index 7d51023d..7d51023d 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.vert b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert
index e9f158c2..e9f158c2 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_notexcoordmesh.vert
+++ b/tests/baseline/data/custommaterial/custommaterial_notexcoordmesh.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_shaded_keywordtest.frag b/tests/baseline/data/custommaterial/custommaterial_shaded_keywordtest.frag
index 8b7d2bdb..8b7d2bdb 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_shaded_keywordtest.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_shaded_keywordtest.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ssao.qml b/tests/baseline/data/custommaterial/custommaterial_ssao.qml
index 889db914..889db914 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_ssao.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_ssao.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_unshaded_depth.qml b/tests/baseline/data/custommaterial/custommaterial_unshaded_depth.qml
index a3f36022..a3f36022 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_unshaded_depth.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_unshaded_depth.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_unshaded_ssao.qml b/tests/baseline/data/custommaterial/custommaterial_unshaded_ssao.qml
index 437e22fd..437e22fd 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_unshaded_ssao.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_unshaded_ssao.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.frag b/tests/baseline/data/custommaterial/custommaterial_uvs.frag
index a487ad1e..a487ad1e 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.frag
+++ b/tests/baseline/data/custommaterial/custommaterial_uvs.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.qml b/tests/baseline/data/custommaterial/custommaterial_uvs.qml
index 74e8d2cb..74e8d2cb 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.qml
+++ b/tests/baseline/data/custommaterial/custommaterial_uvs.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.vert b/tests/baseline/data/custommaterial/custommaterial_uvs.vert
index 5cabc90b..5cabc90b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/custommaterial_uvs.vert
+++ b/tests/baseline/data/custommaterial/custommaterial_uvs.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare.frag b/tests/baseline/data/custommaterial/customprincipledcompare.frag
index 9d8b3287..9d8b3287 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare.frag
+++ b/tests/baseline/data/custommaterial/customprincipledcompare.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare.qml b/tests/baseline/data/custommaterial/customprincipledcompare.qml
index 52564a3c..52564a3c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare.qml
+++ b/tests/baseline/data/custommaterial/customprincipledcompare.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare2.frag b/tests/baseline/data/custommaterial/customprincipledcompare2.frag
index 8e78f1c6..8e78f1c6 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare2.frag
+++ b/tests/baseline/data/custommaterial/customprincipledcompare2.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare_default.frag b/tests/baseline/data/custommaterial/customprincipledcompare_default.frag
index 67b6fbfe..67b6fbfe 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare_default.frag
+++ b/tests/baseline/data/custommaterial/customprincipledcompare_default.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare_default.qml b/tests/baseline/data/custommaterial/customprincipledcompare_default.qml
index 9d7110f3..9d7110f3 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customprincipledcompare_default.qml
+++ b/tests/baseline/data/custommaterial/customprincipledcompare_default.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreenmiptexture.frag b/tests/baseline/data/custommaterial/customscreenmiptexture.frag
index 50a32388..50a32388 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreenmiptexture.frag
+++ b/tests/baseline/data/custommaterial/customscreenmiptexture.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreenmiptexture.qml b/tests/baseline/data/custommaterial/customscreenmiptexture.qml
index a6908082..a6908082 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreenmiptexture.qml
+++ b/tests/baseline/data/custommaterial/customscreenmiptexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture.frag b/tests/baseline/data/custommaterial/customscreentexture.frag
index 43f977df..43f977df 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture.frag
+++ b/tests/baseline/data/custommaterial/customscreentexture.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture.qml b/tests/baseline/data/custommaterial/customscreentexture.qml
index 17b68402..17b68402 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture.qml
+++ b/tests/baseline/data/custommaterial/customscreentexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture_unshaded.frag b/tests/baseline/data/custommaterial/customscreentexture_unshaded.frag
index 2d230424..2d230424 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture_unshaded.frag
+++ b/tests/baseline/data/custommaterial/customscreentexture_unshaded.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture_unshaded.qml b/tests/baseline/data/custommaterial/customscreentexture_unshaded.qml
index e8a97431..e8a97431 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customscreentexture_unshaded.qml
+++ b/tests/baseline/data/custommaterial/customscreentexture_unshaded.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.frag b/tests/baseline/data/custommaterial/customshaded_builtins.frag
index 0fc3043e..0fc3043e 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.frag
+++ b/tests/baseline/data/custommaterial/customshaded_builtins.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.qml b/tests/baseline/data/custommaterial/customshaded_builtins.qml
index ed091cd1..ed091cd1 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.qml
+++ b/tests/baseline/data/custommaterial/customshaded_builtins.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.vert b/tests/baseline/data/custommaterial/customshaded_builtins.vert
index 424ac646..424ac646 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customshaded_builtins.vert
+++ b/tests/baseline/data/custommaterial/customshaded_builtins.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customshadedpostprocess.frag b/tests/baseline/data/custommaterial/customshadedpostprocess.frag
index ac8e9da4..ac8e9da4 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customshadedpostprocess.frag
+++ b/tests/baseline/data/custommaterial/customshadedpostprocess.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customshadedpostprocess.qml b/tests/baseline/data/custommaterial/customshadedpostprocess.qml
index 572dd38b..572dd38b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customshadedpostprocess.qml
+++ b/tests/baseline/data/custommaterial/customshadedpostprocess.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.frag b/tests/baseline/data/custommaterial/customsimple.frag
index 9ac52b8c..9ac52b8c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.frag
+++ b/tests/baseline/data/custommaterial/customsimple.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.qml b/tests/baseline/data/custommaterial/customsimple.qml
index 11e3bc58..11e3bc58 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.qml
+++ b/tests/baseline/data/custommaterial/customsimple.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.vert b/tests/baseline/data/custommaterial/customsimple.vert
index 3a71ba6d..3a71ba6d 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple.vert
+++ b/tests/baseline/data/custommaterial/customsimple.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple_no_position.vert b/tests/baseline/data/custommaterial/customsimple_no_position.vert
index 8f1746a7..8f1746a7 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimple_no_position.vert
+++ b/tests/baseline/data/custommaterial/customsimple_no_position.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.frag b/tests/baseline/data/custommaterial/customsimpletexture.frag
index 928e45e0..928e45e0 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.frag
+++ b/tests/baseline/data/custommaterial/customsimpletexture.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.qml b/tests/baseline/data/custommaterial/customsimpletexture.qml
index 27bbd638..27bbd638 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.qml
+++ b/tests/baseline/data/custommaterial/customsimpletexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.vert b/tests/baseline/data/custommaterial/customsimpletexture.vert
index 27c20e27..27c20e27 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture.vert
+++ b/tests/baseline/data/custommaterial/customsimpletexture.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture2.frag b/tests/baseline/data/custommaterial/customsimpletexture2.frag
index 7e606e0a..7e606e0a 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexture2.frag
+++ b/tests/baseline/data/custommaterial/customsimpletexture2.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexturescreen.frag b/tests/baseline/data/custommaterial/customsimpletexturescreen.frag
index b2d3e28f..b2d3e28f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customsimpletexturescreen.frag
+++ b/tests/baseline/data/custommaterial/customsimpletexturescreen.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling.frag b/tests/baseline/data/custommaterial/customtexturefiltertiling.frag
index da9d04ed..da9d04ed 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling.frag
+++ b/tests/baseline/data/custommaterial/customtexturefiltertiling.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling.qml b/tests/baseline/data/custommaterial/customtexturefiltertiling.qml
index b42d9015..b42d9015 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling.qml
+++ b/tests/baseline/data/custommaterial/customtexturefiltertiling.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling_mip.frag b/tests/baseline/data/custommaterial/customtexturefiltertiling_mip.frag
index aa223f5f..aa223f5f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling_mip.frag
+++ b/tests/baseline/data/custommaterial/customtexturefiltertiling_mip.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling_repeat.frag b/tests/baseline/data/custommaterial/customtexturefiltertiling_repeat.frag
index 3c104642..3c104642 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customtexturefiltertiling_repeat.frag
+++ b/tests/baseline/data/custommaterial/customtexturefiltertiling_repeat.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.frag b/tests/baseline/data/custommaterial/customunshaded.frag
index 705e5dba..705e5dba 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.frag
+++ b/tests/baseline/data/custommaterial/customunshaded.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.qml b/tests/baseline/data/custommaterial/customunshaded.qml
index 3e609e80..3e609e80 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.qml
+++ b/tests/baseline/data/custommaterial/customunshaded.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.vert b/tests/baseline/data/custommaterial/customunshaded.vert
index de73973b..de73973b 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded.vert
+++ b/tests/baseline/data/custommaterial/customunshaded.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.frag b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.frag
index d01e2d9f..d01e2d9f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.frag
+++ b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.qml b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.qml
index 23fdcf41..23fdcf41 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.qml
+++ b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.vert b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert
index d84d669f..d84d669f 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshaded_no_uniforms.vert
+++ b/tests/baseline/data/custommaterial/customunshaded_no_uniforms.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.frag b/tests/baseline/data/custommaterial/customunshadedtexture.frag
index df4ea9df..df4ea9df 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.frag
+++ b/tests/baseline/data/custommaterial/customunshadedtexture.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.qml b/tests/baseline/data/custommaterial/customunshadedtexture.qml
index 5ca08d30..5ca08d30 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.qml
+++ b/tests/baseline/data/custommaterial/customunshadedtexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.vert b/tests/baseline/data/custommaterial/customunshadedtexture.vert
index 56342446..56342446 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/customunshadedtexture.vert
+++ b/tests/baseline/data/custommaterial/customunshadedtexture.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/depthdraw.frag b/tests/baseline/data/custommaterial/depthdraw.frag
index 502b0adc..502b0adc 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/depthdraw.frag
+++ b/tests/baseline/data/custommaterial/depthdraw.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/dummytextures.qml b/tests/baseline/data/custommaterial/dummytextures.qml
index 667215fa..667215fa 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/dummytextures.qml
+++ b/tests/baseline/data/custommaterial/dummytextures.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/fog_with_custommaterial.frag b/tests/baseline/data/custommaterial/fog_with_custommaterial.frag
index b7a66378..b7a66378 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/fog_with_custommaterial.frag
+++ b/tests/baseline/data/custommaterial/fog_with_custommaterial.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/fog_with_custommaterial.qml b/tests/baseline/data/custommaterial/fog_with_custommaterial.qml
index 277a04fd..277a04fd 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/fog_with_custommaterial.qml
+++ b/tests/baseline/data/custommaterial/fog_with_custommaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.frag b/tests/baseline/data/custommaterial/lightmapgen.frag
index 7a933550..7a933550 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.frag
+++ b/tests/baseline/data/custommaterial/lightmapgen.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.qml b/tests/baseline/data/custommaterial/lightmapgen.qml
index 2d80fb50..2d80fb50 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.qml
+++ b/tests/baseline/data/custommaterial/lightmapgen.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.vert b/tests/baseline/data/custommaterial/lightmapgen.vert
index 71a3838d..71a3838d 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen.vert
+++ b/tests/baseline/data/custommaterial/lightmapgen.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_source_invisible.qml b/tests/baseline/data/custommaterial/lightmapgen_source_invisible.qml
index 50f893d3..50f893d3 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_source_invisible.qml
+++ b/tests/baseline/data/custommaterial/lightmapgen_source_invisible.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_source_invisible_inline.qml b/tests/baseline/data/custommaterial/lightmapgen_source_invisible_inline.qml
index 95df8841..95df8841 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_source_invisible_inline.qml
+++ b/tests/baseline/data/custommaterial/lightmapgen_source_invisible_inline.qml
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use.frag b/tests/baseline/data/custommaterial/lightmapgen_use.frag
index 2e340813..2e340813 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use.frag
+++ b/tests/baseline/data/custommaterial/lightmapgen_use.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use.vert b/tests/baseline/data/custommaterial/lightmapgen_use.vert
index 4cff450e..4cff450e 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use.vert
+++ b/tests/baseline/data/custommaterial/lightmapgen_use.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use_inline.vert b/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert
index 5f018954..5f018954 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use_inline.vert
+++ b/tests/baseline/data/custommaterial/lightmapgen_use_inline.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use_layer.vert b/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert
index 86c5d88c..86c5d88c 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/lightmapgen_use_layer.vert
+++ b/tests/baseline/data/custommaterial/lightmapgen_use_layer.vert
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/worldnormal.frag b/tests/baseline/data/custommaterial/worldnormal.frag
index 4ad70aee..4ad70aee 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/worldnormal.frag
+++ b/tests/baseline/data/custommaterial/worldnormal.frag
diff --git a/tests/auto/quick3d_lancelot/data/custommaterial/worldnormal.qml b/tests/baseline/data/custommaterial/worldnormal.qml
index ead7fc95..ead7fc95 100644
--- a/tests/auto/quick3d_lancelot/data/custommaterial/worldnormal.qml
+++ b/tests/baseline/data/custommaterial/worldnormal.qml
diff --git a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_hdr.qml b/tests/baseline/data/customtexturedata/custom_hdr.qml
index a02133f2..a02133f2 100644
--- a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_hdr.qml
+++ b/tests/baseline/data/customtexturedata/custom_hdr.qml
diff --git a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_rgba.qml b/tests/baseline/data/customtexturedata/custom_rgba.qml
index 9f3ca5f9..9f3ca5f9 100644
--- a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_rgba.qml
+++ b/tests/baseline/data/customtexturedata/custom_rgba.qml
diff --git a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_rgbe.qml b/tests/baseline/data/customtexturedata/custom_rgbe.qml
index f49b8bff..f49b8bff 100644
--- a/tests/auto/quick3d_lancelot/data/customtexturedata/custom_rgbe.qml
+++ b/tests/baseline/data/customtexturedata/custom_rgbe.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/BlendComponent.qml b/tests/baseline/data/defaultmaterial/BlendComponent.qml
index 63ca7eae..63ca7eae 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/BlendComponent.qml
+++ b/tests/baseline/data/defaultmaterial/BlendComponent.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/BlendModes.qml b/tests/baseline/data/defaultmaterial/BlendModes.qml
index 35040513..35040513 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/BlendModes.qml
+++ b/tests/baseline/data/defaultmaterial/BlendModes.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/DepthDrawModes.qml b/tests/baseline/data/defaultmaterial/DepthDrawModes.qml
index 59105bb1..59105bb1 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/DepthDrawModes.qml
+++ b/tests/baseline/data/defaultmaterial/DepthDrawModes.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/DepthDrawModesPrepass.qml b/tests/baseline/data/defaultmaterial/DepthDrawModesPrepass.qml
index 4d8395d3..4d8395d3 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/DepthDrawModesPrepass.qml
+++ b/tests/baseline/data/defaultmaterial/DepthDrawModesPrepass.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/Primitives.qml b/tests/baseline/data/defaultmaterial/Primitives.qml
index 62279837..62279837 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/Primitives.qml
+++ b/tests/baseline/data/defaultmaterial/Primitives.qml
diff --git a/tests/auto/quick3d_lancelot/data/defaultmaterial/SpecularModel.qml b/tests/baseline/data/defaultmaterial/SpecularModel.qml
index 3654e7d5..3654e7d5 100644
--- a/tests/auto/quick3d_lancelot/data/defaultmaterial/SpecularModel.qml
+++ b/tests/baseline/data/defaultmaterial/SpecularModel.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/PlainView.qml b/tests/baseline/data/effects/PlainView.qml
index 91e11b35..91e11b35 100644
--- a/tests/auto/quick3d_lancelot/data/effects/PlainView.qml
+++ b/tests/baseline/data/effects/PlainView.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/aberration.qml b/tests/baseline/data/effects/aberration.qml
index 0cc294fe..0cc294fe 100644
--- a/tests/auto/quick3d_lancelot/data/effects/aberration.qml
+++ b/tests/baseline/data/effects/aberration.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/bleak.qml b/tests/baseline/data/effects/bleak.qml
index 2fb9508b..2fb9508b 100644
--- a/tests/auto/quick3d_lancelot/data/effects/bleak.qml
+++ b/tests/baseline/data/effects/bleak.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/blurs.qml b/tests/baseline/data/effects/blurs.qml
index 93ca1889..93ca1889 100644
--- a/tests/auto/quick3d_lancelot/data/effects/blurs.qml
+++ b/tests/baseline/data/effects/blurs.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/brushstrokes.qml b/tests/baseline/data/effects/brushstrokes.qml
index 450f6984..450f6984 100644
--- a/tests/auto/quick3d_lancelot/data/effects/brushstrokes.qml
+++ b/tests/baseline/data/effects/brushstrokes.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/colors.qml b/tests/baseline/data/effects/colors.qml
index db2b85a2..db2b85a2 100644
--- a/tests/auto/quick3d_lancelot/data/effects/colors.qml
+++ b/tests/baseline/data/effects/colors.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple.qml b/tests/baseline/data/effects/custom_effect_simple.qml
index 4daa0c26..4daa0c26 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple.qml
+++ b/tests/baseline/data/effects/custom_effect_simple.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_0.frag b/tests/baseline/data/effects/custom_effect_simple_0.frag
index 81fc89f4..81fc89f4 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_0.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_0.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_1.frag b/tests/baseline/data/effects/custom_effect_simple_1.frag
index dae39bd7..dae39bd7 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_1.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_1.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_1.vert b/tests/baseline/data/effects/custom_effect_simple_1.vert
index 53dd2bdb..53dd2bdb 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_1.vert
+++ b/tests/baseline/data/effects/custom_effect_simple_1.vert
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_2.vert b/tests/baseline/data/effects/custom_effect_simple_2.vert
index d1f21806..d1f21806 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_2.vert
+++ b/tests/baseline/data/effects/custom_effect_simple_2.vert
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_3_1.frag b/tests/baseline/data/effects/custom_effect_simple_3_1.frag
index a55c3647..a55c3647 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_3_1.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_3_1.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_3_2.frag b/tests/baseline/data/effects/custom_effect_simple_3_2.frag
index 5056002a..5056002a 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_3_2.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_3_2.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_5_1.frag b/tests/baseline/data/effects/custom_effect_simple_5_1.frag
index c1ea0d61..c1ea0d61 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_5_1.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_5_1.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_5_2.frag b/tests/baseline/data/effects/custom_effect_simple_5_2.frag
index a4e82c5c..a4e82c5c 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_simple_5_2.frag
+++ b/tests/baseline/data/effects/custom_effect_simple_5_2.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/custom_effect_texture.qml b/tests/baseline/data/effects/custom_effect_texture.qml
index 7d4e6ebf..7d4e6ebf 100644
--- a/tests/auto/quick3d_lancelot/data/effects/custom_effect_texture.qml
+++ b/tests/baseline/data/effects/custom_effect_texture.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/depth.qml b/tests/baseline/data/effects/depth.qml
index 31c9ec87..31c9ec87 100644
--- a/tests/auto/quick3d_lancelot/data/effects/depth.qml
+++ b/tests/baseline/data/effects/depth.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/distortion1.qml b/tests/baseline/data/effects/distortion1.qml
index 714a270d..714a270d 100644
--- a/tests/auto/quick3d_lancelot/data/effects/distortion1.qml
+++ b/tests/baseline/data/effects/distortion1.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/distortion2.qml b/tests/baseline/data/effects/distortion2.qml
index 8826f234..8826f234 100644
--- a/tests/auto/quick3d_lancelot/data/effects/distortion2.qml
+++ b/tests/baseline/data/effects/distortion2.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/edge.qml b/tests/baseline/data/effects/edge.qml
index 001d6f73..001d6f73 100644
--- a/tests/auto/quick3d_lancelot/data/effects/edge.qml
+++ b/tests/baseline/data/effects/edge.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/flip.qml b/tests/baseline/data/effects/flip.qml
index a9b1667d..a9b1667d 100644
--- a/tests/auto/quick3d_lancelot/data/effects/flip.qml
+++ b/tests/baseline/data/effects/flip.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/item_as_effect_input.frag b/tests/baseline/data/effects/item_as_effect_input.frag
index a022929d..a022929d 100644
--- a/tests/auto/quick3d_lancelot/data/effects/item_as_effect_input.frag
+++ b/tests/baseline/data/effects/item_as_effect_input.frag
diff --git a/tests/auto/quick3d_lancelot/data/effects/item_as_effect_input.qml b/tests/baseline/data/effects/item_as_effect_input.qml
index 4fa15ad0..4fa15ad0 100644
--- a/tests/auto/quick3d_lancelot/data/effects/item_as_effect_input.qml
+++ b/tests/baseline/data/effects/item_as_effect_input.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/misc.qml b/tests/baseline/data/effects/misc.qml
index 45d2ffca..45d2ffca 100644
--- a/tests/auto/quick3d_lancelot/data/effects/misc.qml
+++ b/tests/baseline/data/effects/misc.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/move.qml b/tests/baseline/data/effects/move.qml
index 4ac113ed..4ac113ed 100644
--- a/tests/auto/quick3d_lancelot/data/effects/move.qml
+++ b/tests/baseline/data/effects/move.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/sequence.qml b/tests/baseline/data/effects/sequence.qml
index ae114c75..ae114c75 100644
--- a/tests/auto/quick3d_lancelot/data/effects/sequence.qml
+++ b/tests/baseline/data/effects/sequence.qml
diff --git a/tests/auto/quick3d_lancelot/data/effects/tonemaps.qml b/tests/baseline/data/effects/tonemaps.qml
index a2038b0e..a2038b0e 100644
--- a/tests/auto/quick3d_lancelot/data/effects/tonemaps.qml
+++ b/tests/baseline/data/effects/tonemaps.qml
diff --git a/tests/auto/quick3d_lancelot/data/helpers/axishelper.qml b/tests/baseline/data/helpers/axishelper.qml
index 54c77947..54c77947 100644
--- a/tests/auto/quick3d_lancelot/data/helpers/axishelper.qml
+++ b/tests/baseline/data/helpers/axishelper.qml
diff --git a/tests/auto/quick3d_lancelot/data/helpers/gridgeometry.qml b/tests/baseline/data/helpers/gridgeometry.qml
index 1eebb968..1eebb968 100644
--- a/tests/auto/quick3d_lancelot/data/helpers/gridgeometry.qml
+++ b/tests/baseline/data/helpers/gridgeometry.qml
diff --git a/tests/auto/quick3d_lancelot/data/helpers/gridgeometry_widelines.qml b/tests/baseline/data/helpers/gridgeometry_widelines.qml
index 66ee8c4f..66ee8c4f 100644
--- a/tests/auto/quick3d_lancelot/data/helpers/gridgeometry_widelines.qml
+++ b/tests/baseline/data/helpers/gridgeometry_widelines.qml
diff --git a/tests/auto/quick3d_lancelot/data/helpers/heightfield.png b/tests/baseline/data/helpers/heightfield.png
index ef8897ec..ef8897ec 100644
--- a/tests/auto/quick3d_lancelot/data/helpers/heightfield.png
+++ b/tests/baseline/data/helpers/heightfield.png
diff --git a/tests/auto/quick3d_lancelot/data/helpers/heightfieldgeometry.qml b/tests/baseline/data/helpers/heightfieldgeometry.qml
index c45ab4d7..c45ab4d7 100644
--- a/tests/auto/quick3d_lancelot/data/helpers/heightfieldgeometry.qml
+++ b/tests/baseline/data/helpers/heightfieldgeometry.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/Primitives.qml b/tests/baseline/data/instancing/Primitives.qml
index 08672cd9..08672cd9 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/Primitives.qml
+++ b/tests/baseline/data/instancing/Primitives.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customdata.vert b/tests/baseline/data/instancing/customdata.vert
index 1742786e..1742786e 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customdata.vert
+++ b/tests/baseline/data/instancing/customdata.vert
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customsimple.frag b/tests/baseline/data/instancing/customsimple.frag
index 9ac52b8c..9ac52b8c 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customsimple.frag
+++ b/tests/baseline/data/instancing/customsimple.frag
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customsimple.qml b/tests/baseline/data/instancing/customsimple.qml
index a64f4bc9..a64f4bc9 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customsimple.qml
+++ b/tests/baseline/data/instancing/customsimple.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customsimple.vert b/tests/baseline/data/instancing/customsimple.vert
index b5d961f5..b5d961f5 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customsimple.vert
+++ b/tests/baseline/data/instancing/customsimple.vert
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customsimple_no_position.vert b/tests/baseline/data/instancing/customsimple_no_position.vert
index 8f1746a7..8f1746a7 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customsimple_no_position.vert
+++ b/tests/baseline/data/instancing/customsimple_no_position.vert
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.frag b/tests/baseline/data/instancing/customunshaded.frag
index 705e5dba..705e5dba 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.frag
+++ b/tests/baseline/data/instancing/customunshaded.frag
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.qml b/tests/baseline/data/instancing/customunshaded.qml
index 2337aa04..2337aa04 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.qml
+++ b/tests/baseline/data/instancing/customunshaded.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.vert b/tests/baseline/data/instancing/customunshaded.vert
index 61d5f633..61d5f633 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/customunshaded.vert
+++ b/tests/baseline/data/instancing/customunshaded.vert
diff --git a/tests/auto/quick3d_lancelot/data/instancing/fileinstancing.qml b/tests/baseline/data/instancing/fileinstancing.qml
index 0f16cd05..0f16cd05 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/fileinstancing.qml
+++ b/tests/baseline/data/instancing/fileinstancing.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/instance-transform.qml b/tests/baseline/data/instancing/instance-transform.qml
index 12383f58..12383f58 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/instance-transform.qml
+++ b/tests/baseline/data/instancing/instance-transform.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/instancecountoverride.qml b/tests/baseline/data/instancing/instancecountoverride.qml
index fda0f52c..fda0f52c 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/instancecountoverride.qml
+++ b/tests/baseline/data/instancing/instancecountoverride.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/instancelist.xml b/tests/baseline/data/instancing/instancelist.xml
index 156eceb4..156eceb4 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/instancelist.xml
+++ b/tests/baseline/data/instancing/instancelist.xml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/sharedmaterial.qml b/tests/baseline/data/instancing/sharedmaterial.qml
index 468ae739..468ae739 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/sharedmaterial.qml
+++ b/tests/baseline/data/instancing/sharedmaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/wrongsourcedontregenerate.xml b/tests/baseline/data/instancing/wrongsourcedontregenerate.xml
index 6d166c8f..6d166c8f 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/wrongsourcedontregenerate.xml
+++ b/tests/baseline/data/instancing/wrongsourcedontregenerate.xml
diff --git a/tests/auto/quick3d_lancelot/data/instancing/wrongsourcedontregenerate.xml.bin b/tests/baseline/data/instancing/wrongsourcedontregenerate.xml.bin
index 9eadde38..9eadde38 100644
--- a/tests/auto/quick3d_lancelot/data/instancing/wrongsourcedontregenerate.xml.bin
+++ b/tests/baseline/data/instancing/wrongsourcedontregenerate.xml.bin
diff --git a/tests/auto/quick3d_lancelot/data/layers/Ambient_occlusion.qml b/tests/baseline/data/layers/Ambient_occlusion.qml
index 31f83eb4..31f83eb4 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Ambient_occlusion.qml
+++ b/tests/baseline/data/layers/Ambient_occlusion.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Background_solidcolor.qml b/tests/baseline/data/layers/Background_solidcolor.qml
index c5a40cf8..c5a40cf8 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Background_solidcolor.qml
+++ b/tests/baseline/data/layers/Background_solidcolor.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Defaults.qml b/tests/baseline/data/layers/Defaults.qml
index f15dc093..f15dc093 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Defaults.qml
+++ b/tests/baseline/data/layers/Defaults.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Disable_depth_prepass.qml b/tests/baseline/data/layers/Disable_depth_prepass.qml
index 072270f4..072270f4 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Disable_depth_prepass.qml
+++ b/tests/baseline/data/layers/Disable_depth_prepass.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Disable_depth_test.qml b/tests/baseline/data/layers/Disable_depth_test.qml
index aae3e5dd..aae3e5dd 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Disable_depth_test.qml
+++ b/tests/baseline/data/layers/Disable_depth_test.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Fog.qml b/tests/baseline/data/layers/Fog.qml
index 65a4da51..65a4da51 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Fog.qml
+++ b/tests/baseline/data/layers/Fog.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_1.qml b/tests/baseline/data/layers/Geometry_1.qml
index 3e698f19..3e698f19 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_1.qml
+++ b/tests/baseline/data/layers/Geometry_1.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_2.qml b/tests/baseline/data/layers/Geometry_2.qml
index 0cac2d6c..0cac2d6c 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_2.qml
+++ b/tests/baseline/data/layers/Geometry_2.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_3.qml b/tests/baseline/data/layers/Geometry_3.qml
index fda7fa59..fda7fa59 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_3.qml
+++ b/tests/baseline/data/layers/Geometry_3.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_4.qml b/tests/baseline/data/layers/Geometry_4.qml
index bf916cd1..bf916cd1 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_4.qml
+++ b/tests/baseline/data/layers/Geometry_4.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_5.qml b/tests/baseline/data/layers/Geometry_5.qml
index 71d7a257..71d7a257 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_5.qml
+++ b/tests/baseline/data/layers/Geometry_5.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Geometry_6.qml b/tests/baseline/data/layers/Geometry_6.qml
index afd166ae..afd166ae 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Geometry_6.qml
+++ b/tests/baseline/data/layers/Geometry_6.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Light_probe.qml b/tests/baseline/data/layers/Light_probe.qml
index 612e6001..612e6001 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Light_probe.qml
+++ b/tests/baseline/data/layers/Light_probe.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Light_probe_orientation.qml b/tests/baseline/data/layers/Light_probe_orientation.qml
index 5f1666d2..5f1666d2 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Light_probe_orientation.qml
+++ b/tests/baseline/data/layers/Light_probe_orientation.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_AmbientOcclusion.qml b/tests/baseline/data/layers/MaterialOverride_AmbientOcclusion.qml
index 145df0b0..145df0b0 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_AmbientOcclusion.qml
+++ b/tests/baseline/data/layers/MaterialOverride_AmbientOcclusion.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_BaseColor.qml b/tests/baseline/data/layers/MaterialOverride_BaseColor.qml
index 17cf9c8e..17cf9c8e 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_BaseColor.qml
+++ b/tests/baseline/data/layers/MaterialOverride_BaseColor.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Binormals.qml b/tests/baseline/data/layers/MaterialOverride_Binormals.qml
index a4450b4d..a4450b4d 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Binormals.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Binormals.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Diffuse.qml b/tests/baseline/data/layers/MaterialOverride_Diffuse.qml
index 8e81daec..8e81daec 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Diffuse.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Diffuse.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Emission.qml b/tests/baseline/data/layers/MaterialOverride_Emission.qml
index 049ad3a6..049ad3a6 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Emission.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Emission.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_F0.qml b/tests/baseline/data/layers/MaterialOverride_F0.qml
index 42a3cf90..42a3cf90 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_F0.qml
+++ b/tests/baseline/data/layers/MaterialOverride_F0.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Metalness.qml b/tests/baseline/data/layers/MaterialOverride_Metalness.qml
index 98f09079..98f09079 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Metalness.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Metalness.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_None.qml b/tests/baseline/data/layers/MaterialOverride_None.qml
index b9fefd4f..b9fefd4f 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_None.qml
+++ b/tests/baseline/data/layers/MaterialOverride_None.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Normals.qml b/tests/baseline/data/layers/MaterialOverride_Normals.qml
index e5de2cba..e5de2cba 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Normals.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Normals.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Roughness.qml b/tests/baseline/data/layers/MaterialOverride_Roughness.qml
index afa18bc7..afa18bc7 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Roughness.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Roughness.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_ShadowOcclusion.qml b/tests/baseline/data/layers/MaterialOverride_ShadowOcclusion.qml
index db276fd8..db276fd8 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_ShadowOcclusion.qml
+++ b/tests/baseline/data/layers/MaterialOverride_ShadowOcclusion.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Specular.qml b/tests/baseline/data/layers/MaterialOverride_Specular.qml
index cdadd6c1..cdadd6c1 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Specular.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Specular.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Tangents.qml b/tests/baseline/data/layers/MaterialOverride_Tangents.qml
index 6bb646a8..6bb646a8 100644
--- a/tests/auto/quick3d_lancelot/data/layers/MaterialOverride_Tangents.qml
+++ b/tests/baseline/data/layers/MaterialOverride_Tangents.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_2x.qml b/tests/baseline/data/layers/Multisample_aa_2x.qml
index d8f91d5d..d8f91d5d 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_2x.qml
+++ b/tests/baseline/data/layers/Multisample_aa_2x.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_4x.qml b/tests/baseline/data/layers/Multisample_aa_4x.qml
index ba079bcd..ba079bcd 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_4x.qml
+++ b/tests/baseline/data/layers/Multisample_aa_4x.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_ssaa.qml b/tests/baseline/data/layers/Multisample_aa_ssaa.qml
index 38a6d2af..38a6d2af 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Multisample_aa_ssaa.qml
+++ b/tests/baseline/data/layers/Multisample_aa_ssaa.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Progressive_aa.qml b/tests/baseline/data/layers/Progressive_aa.qml
index 685d42d5..685d42d5 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Progressive_aa.qml
+++ b/tests/baseline/data/layers/Progressive_aa.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Scissor1.qml b/tests/baseline/data/layers/Scissor1.qml
index 311db15e..311db15e 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Scissor1.qml
+++ b/tests/baseline/data/layers/Scissor1.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Scissor2.qml b/tests/baseline/data/layers/Scissor2.qml
index b01b6891..b01b6891 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Scissor2.qml
+++ b/tests/baseline/data/layers/Scissor2.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Ssaa.qml b/tests/baseline/data/layers/Ssaa.qml
index 607d7809..607d7809 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Ssaa.qml
+++ b/tests/baseline/data/layers/Ssaa.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Temporal_aa.qml b/tests/baseline/data/layers/Temporal_aa.qml
index 8b6468a2..8b6468a2 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Temporal_aa.qml
+++ b/tests/baseline/data/layers/Temporal_aa.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/TonemappingTestScene.qml b/tests/baseline/data/layers/TonemappingTestScene.qml
index 1fef5ce6..1fef5ce6 100644
--- a/tests/auto/quick3d_lancelot/data/layers/TonemappingTestScene.qml
+++ b/tests/baseline/data/layers/TonemappingTestScene.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_aces.qml b/tests/baseline/data/layers/Tonemapping_aces.qml
index 75404f1d..75404f1d 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_aces.qml
+++ b/tests/baseline/data/layers/Tonemapping_aces.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_aces.qml b/tests/baseline/data/layers/Tonemapping_clearcolor_aces.qml
index 6c56f277..6c56f277 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_aces.qml
+++ b/tests/baseline/data/layers/Tonemapping_clearcolor_aces.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_filmic.qml b/tests/baseline/data/layers/Tonemapping_clearcolor_filmic.qml
index 3d9c898d..3d9c898d 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_filmic.qml
+++ b/tests/baseline/data/layers/Tonemapping_clearcolor_filmic.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_hejldawson.qml b/tests/baseline/data/layers/Tonemapping_clearcolor_hejldawson.qml
index e94a9406..e94a9406 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_hejldawson.qml
+++ b/tests/baseline/data/layers/Tonemapping_clearcolor_hejldawson.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_linear.qml b/tests/baseline/data/layers/Tonemapping_clearcolor_linear.qml
index 8bb9f4af..8bb9f4af 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_linear.qml
+++ b/tests/baseline/data/layers/Tonemapping_clearcolor_linear.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_none.qml b/tests/baseline/data/layers/Tonemapping_clearcolor_none.qml
index 30ec180d..30ec180d 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_clearcolor_none.qml
+++ b/tests/baseline/data/layers/Tonemapping_clearcolor_none.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_filmic.qml b/tests/baseline/data/layers/Tonemapping_filmic.qml
index 38cb1d6b..38cb1d6b 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_filmic.qml
+++ b/tests/baseline/data/layers/Tonemapping_filmic.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejldawson.qml b/tests/baseline/data/layers/Tonemapping_hejldawson.qml
index 0da98521..0da98521 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejldawson.qml
+++ b/tests/baseline/data/layers/Tonemapping_hejldawson.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_linear.qml b/tests/baseline/data/layers/Tonemapping_linear.qml
index 99d144b8..99d144b8 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_linear.qml
+++ b/tests/baseline/data/layers/Tonemapping_linear.qml
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_none.qml b/tests/baseline/data/layers/Tonemapping_none.qml
index 29fc17b2..29fc17b2 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_none.qml
+++ b/tests/baseline/data/layers/Tonemapping_none.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/Box.qml b/tests/baseline/data/lighting/Box.qml
index 3d38b1a7..3d38b1a7 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/Box.qml
+++ b/tests/baseline/data/lighting/Box.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/Imagebasedlighting.qml b/tests/baseline/data/lighting/Imagebasedlighting.qml
index d0ac62bd..d0ac62bd 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/Imagebasedlighting.qml
+++ b/tests/baseline/data/lighting/Imagebasedlighting.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/LocalIBL.qml b/tests/baseline/data/lighting/LocalIBL.qml
index af575dc4..af575dc4 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/LocalIBL.qml
+++ b/tests/baseline/data/lighting/LocalIBL.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/ModelWithSmallScale.qml b/tests/baseline/data/lighting/ModelWithSmallScale.qml
index 7d4b8526..7d4b8526 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/ModelWithSmallScale.qml
+++ b/tests/baseline/data/lighting/ModelWithSmallScale.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/ScopedLights.qml b/tests/baseline/data/lighting/ScopedLights.qml
index 05af9396..05af9396 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/ScopedLights.qml
+++ b/tests/baseline/data/lighting/ScopedLights.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL.qml b/tests/baseline/data/lighting/SkyboxIBL.qml
index 0fe48eca..0fe48eca 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr.qml b/tests/baseline/data/lighting/SkyboxIBL_exr.qml
index 69fefa26..69fefa26 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_exr.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_baked.qml b/tests/baseline/data/lighting/SkyboxIBL_exr_baked.qml
index 06225e75..06225e75 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_baked.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_exr_baked.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_singleChannel.qml b/tests/baseline/data/lighting/SkyboxIBL_exr_singleChannel.qml
index 4a852f86..4a852f86 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_singleChannel.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_exr_singleChannel.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_tiled.qml b/tests/baseline/data/lighting/SkyboxIBL_exr_tiled.qml
index 00245a81..00245a81 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_exr_tiled.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_exr_tiled.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_with_compressed.qml b/tests/baseline/data/lighting/SkyboxIBL_with_compressed.qml
index 98178c76..98178c76 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_with_compressed.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_with_compressed.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_with_png.qml b/tests/baseline/data/lighting/SkyboxIBL_with_png.qml
index b5778202..b5778202 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/SkyboxIBL_with_png.qml
+++ b/tests/baseline/data/lighting/SkyboxIBL_with_png.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/bakedlightprobe.qml b/tests/baseline/data/lighting/bakedlightprobe.qml
index 960cbf2b..960cbf2b 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/bakedlightprobe.qml
+++ b/tests/baseline/data/lighting/bakedlightprobe.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/colors.qml b/tests/baseline/data/lighting/colors.qml
index 29affd6d..29affd6d 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/colors.qml
+++ b/tests/baseline/data/lighting/colors.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/lightmap.qml b/tests/baseline/data/lighting/lightmap.qml
index 0915589f..0915589f 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/lightmap.qml
+++ b/tests/baseline/data/lighting/lightmap.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/lightmap_without_lightmap.qml b/tests/baseline/data/lighting/lightmap_without_lightmap.qml
index 71f8e799..71f8e799 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/lightmap_without_lightmap.qml
+++ b/tests/baseline/data/lighting/lightmap_without_lightmap.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/lightmaps/qlm_box.exr b/tests/baseline/data/lighting/lightmaps/qlm_box.exr
index 5c82ae6f..5c82ae6f 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/lightmaps/qlm_box.exr
+++ b/tests/baseline/data/lighting/lightmaps/qlm_box.exr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/lightmaps/qlm_box.mesh b/tests/baseline/data/lighting/lightmaps/qlm_box.mesh
index cbda1c89..cbda1c89 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/lightmaps/qlm_box.mesh
+++ b/tests/baseline/data/lighting/lightmaps/qlm_box.mesh
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/Cork1.jpg b/tests/baseline/data/lighting/maps/Cork1.jpg
index 94660987..94660987 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/Cork1.jpg
+++ b/tests/baseline/data/lighting/maps/Cork1.jpg
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_Gerlos-512.hdr b/tests/baseline/data/lighting/maps/OpenfootageNET_Gerlos-512.hdr
index 7119b260..7119b260 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_Gerlos-512.hdr
+++ b/tests/baseline/data/lighting/maps/OpenfootageNET_Gerlos-512.hdr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_fieldairport-512.hdr b/tests/baseline/data/lighting/maps/OpenfootageNET_fieldairport-512.hdr
index abdebdb7..abdebdb7 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_fieldairport-512.hdr
+++ b/tests/baseline/data/lighting/maps/OpenfootageNET_fieldairport-512.hdr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_garage-1024.hdr b/tests/baseline/data/lighting/maps/OpenfootageNET_garage-1024.hdr
index 01e9e38a..01e9e38a 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_garage-1024.hdr
+++ b/tests/baseline/data/lighting/maps/OpenfootageNET_garage-1024.hdr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_lowerAustria01-512.hdr b/tests/baseline/data/lighting/maps/OpenfootageNET_lowerAustria01-512.hdr
index df12f021..df12f021 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/OpenfootageNET_lowerAustria01-512.hdr
+++ b/tests/baseline/data/lighting/maps/OpenfootageNET_lowerAustria01-512.hdr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/TestEnvironment-512_R.exr b/tests/baseline/data/lighting/maps/TestEnvironment-512_R.exr
index aba7e209..aba7e209 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/TestEnvironment-512_R.exr
+++ b/tests/baseline/data/lighting/maps/TestEnvironment-512_R.exr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/TestEnvironment-512_tiled.exr b/tests/baseline/data/lighting/maps/TestEnvironment-512_tiled.exr
index 75a5c9a3..75a5c9a3 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/TestEnvironment-512_tiled.exr
+++ b/tests/baseline/data/lighting/maps/TestEnvironment-512_tiled.exr
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/garage-bc1.ktx b/tests/baseline/data/lighting/maps/garage-bc1.ktx
index 6f2c159b..6f2c159b 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/garage-bc1.ktx
+++ b/tests/baseline/data/lighting/maps/garage-bc1.ktx
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/garage-rgba.png b/tests/baseline/data/lighting/maps/garage-rgba.png
index 31264cbc..31264cbc 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/garage-rgba.png
+++ b/tests/baseline/data/lighting/maps/garage-rgba.png
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/basecolor.jpg b/tests/baseline/data/lighting/maps/metallic/basecolor.jpg
index 44018274..44018274 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/basecolor.jpg
+++ b/tests/baseline/data/lighting/maps/metallic/basecolor.jpg
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/metallic.jpg b/tests/baseline/data/lighting/maps/metallic/metallic.jpg
index 6fe7b171..6fe7b171 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/metallic.jpg
+++ b/tests/baseline/data/lighting/maps/metallic/metallic.jpg
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/normal.jpg b/tests/baseline/data/lighting/maps/metallic/normal.jpg
index c8d1a592..c8d1a592 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/normal.jpg
+++ b/tests/baseline/data/lighting/maps/metallic/normal.jpg
diff --git a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/roughness.jpg b/tests/baseline/data/lighting/maps/metallic/roughness.jpg
index f200e332..f200e332 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/maps/metallic/roughness.jpg
+++ b/tests/baseline/data/lighting/maps/metallic/roughness.jpg
diff --git a/tests/auto/quick3d_lancelot/data/lighting/materials/Default_002.qml b/tests/baseline/data/lighting/materials/Default_002.qml
index 33b618bf..33b618bf 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/materials/Default_002.qml
+++ b/tests/baseline/data/lighting/materials/Default_002.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/materials/Default_009.qml b/tests/baseline/data/lighting/materials/Default_009.qml
index e05c083c..e05c083c 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/materials/Default_009.qml
+++ b/tests/baseline/data/lighting/materials/Default_009.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/materials/Material.qml b/tests/baseline/data/lighting/materials/Material.qml
index b02cf3b2..b02cf3b2 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/materials/Material.qml
+++ b/tests/baseline/data/lighting/materials/Material.qml
diff --git a/tests/auto/quick3d_lancelot/data/lighting/models/box.mesh b/tests/baseline/data/lighting/models/box.mesh
index 6627594e..6627594e 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/models/box.mesh
+++ b/tests/baseline/data/lighting/models/box.mesh
diff --git a/tests/auto/quick3d_lancelot/data/lighting/models/testCube/meshes/Cube.mesh b/tests/baseline/data/lighting/models/testCube/meshes/Cube.mesh
index 7b17e27f..7b17e27f 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/models/testCube/meshes/Cube.mesh
+++ b/tests/baseline/data/lighting/models/testCube/meshes/Cube.mesh
diff --git a/tests/auto/quick3d_lancelot/data/lighting/textureColors.qml b/tests/baseline/data/lighting/textureColors.qml
index 8a265aa5..8a265aa5 100644
--- a/tests/auto/quick3d_lancelot/data/lighting/textureColors.qml
+++ b/tests/baseline/data/lighting/textureColors.qml
diff --git a/tests/auto/quick3d_lancelot/data/morphanim/custommorph.vert b/tests/baseline/data/morphanim/custommorph.vert
index fa3db3e0..fa3db3e0 100644
--- a/tests/auto/quick3d_lancelot/data/morphanim/custommorph.vert
+++ b/tests/baseline/data/morphanim/custommorph.vert
diff --git a/tests/auto/quick3d_lancelot/data/morphanim/morphSuzanne.qml b/tests/baseline/data/morphanim/morphSuzanne.qml
index 8b19425d..8b19425d 100644
--- a/tests/auto/quick3d_lancelot/data/morphanim/morphSuzanne.qml
+++ b/tests/baseline/data/morphanim/morphSuzanne.qml
diff --git a/tests/auto/quick3d_lancelot/data/morphanim/morphSuzanne_custom.qml b/tests/baseline/data/morphanim/morphSuzanne_custom.qml
index abd3ce91..abd3ce91 100644
--- a/tests/auto/quick3d_lancelot/data/morphanim/morphSuzanne_custom.qml
+++ b/tests/baseline/data/morphanim/morphSuzanne_custom.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/AttractorShapes.qml b/tests/baseline/data/particles3d/AttractorShapes.qml
index 6bbcee86..6bbcee86 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/AttractorShapes.qml
+++ b/tests/baseline/data/particles3d/AttractorShapes.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/CameraAndSystemMovement.qml b/tests/baseline/data/particles3d/CameraAndSystemMovement.qml
index 979078e7..979078e7 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/CameraAndSystemMovement.qml
+++ b/tests/baseline/data/particles3d/CameraAndSystemMovement.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/EmitAndBurst.qml b/tests/baseline/data/particles3d/EmitAndBurst.qml
index e4cb61db..e4cb61db 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/EmitAndBurst.qml
+++ b/tests/baseline/data/particles3d/EmitAndBurst.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/LightsOff.qml b/tests/baseline/data/particles3d/LightsOff.qml
index bb07cc52..bb07cc52 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/LightsOff.qml
+++ b/tests/baseline/data/particles3d/LightsOff.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/LightsOn.qml b/tests/baseline/data/particles3d/LightsOn.qml
index c0e6ba8c..c0e6ba8c 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/LightsOn.qml
+++ b/tests/baseline/data/particles3d/LightsOn.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/LineParticles.qml b/tests/baseline/data/particles3d/LineParticles.qml
index 35a50b32..35a50b32 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/LineParticles.qml
+++ b/tests/baseline/data/particles3d/LineParticles.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/ModelBlendParticles.qml b/tests/baseline/data/particles3d/ModelBlendParticles.qml
index 1981e7bb..1981e7bb 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/ModelBlendParticles.qml
+++ b/tests/baseline/data/particles3d/ModelBlendParticles.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/NodeHierarchy.qml b/tests/baseline/data/particles3d/NodeHierarchy.qml
index 37b81e53..37b81e53 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/NodeHierarchy.qml
+++ b/tests/baseline/data/particles3d/NodeHierarchy.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/Opacity.qml b/tests/baseline/data/particles3d/Opacity.qml
index 829b186d..829b186d 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/Opacity.qml
+++ b/tests/baseline/data/particles3d/Opacity.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/SpriteColorTable.qml b/tests/baseline/data/particles3d/SpriteColorTable.qml
index 88367450..88367450 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/SpriteColorTable.qml
+++ b/tests/baseline/data/particles3d/SpriteColorTable.qml
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/images/colorTable.png b/tests/baseline/data/particles3d/images/colorTable.png
index ecac519f..ecac519f 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/images/colorTable.png
+++ b/tests/baseline/data/particles3d/images/colorTable.png
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/images/qt_logo.png b/tests/baseline/data/particles3d/images/qt_logo.png
index ab7dd8ad..ab7dd8ad 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/images/qt_logo.png
+++ b/tests/baseline/data/particles3d/images/qt_logo.png
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/images/sphere.png b/tests/baseline/data/particles3d/images/sphere.png
index 3ed902d1..3ed902d1 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/images/sphere.png
+++ b/tests/baseline/data/particles3d/images/sphere.png
diff --git a/tests/auto/quick3d_lancelot/data/particles3d/qt_logo_in_4096.cbor b/tests/baseline/data/particles3d/qt_logo_in_4096.cbor
index 53c4ead4..53c4ead4 100644
--- a/tests/auto/quick3d_lancelot/data/particles3d/qt_logo_in_4096.cbor
+++ b/tests/baseline/data/particles3d/qt_logo_in_4096.cbor
diff --git a/tests/auto/quick3d_lancelot/data/pivot/SimplePivotTest.qml b/tests/baseline/data/pivot/SimplePivotTest.qml
index 45b8ca93..45b8ca93 100644
--- a/tests/auto/quick3d_lancelot/data/pivot/SimplePivotTest.qml
+++ b/tests/baseline/data/pivot/SimplePivotTest.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/alpha.qml b/tests/baseline/data/principled/alpha.qml
index 1f979a28..1f979a28 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alpha.qml
+++ b/tests/baseline/data/principled/alpha.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/alphaMode.qml b/tests/baseline/data/principled/alphaMode.qml
index 3ce530d4..3ce530d4 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alphaMode.qml
+++ b/tests/baseline/data/principled/alphaMode.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/alphaMode_NoLight.qml b/tests/baseline/data/principled/alphaMode_NoLight.qml
index 8a1d93e4..8a1d93e4 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alphaMode_NoLight.qml
+++ b/tests/baseline/data/principled/alphaMode_NoLight.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/alphaMode_opacity.qml b/tests/baseline/data/principled/alphaMode_opacity.qml
index 9166cac4..9166cac4 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alphaMode_opacity.qml
+++ b/tests/baseline/data/principled/alphaMode_opacity.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/alphaMode_shadow.qml b/tests/baseline/data/principled/alphaMode_shadow.qml
index 01ae9dad..01ae9dad 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alphaMode_shadow.qml
+++ b/tests/baseline/data/principled/alphaMode_shadow.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/attenuation.qml b/tests/baseline/data/principled/attenuation.qml
index de2b0c48..de2b0c48 100644
--- a/tests/auto/quick3d_lancelot/data/principled/attenuation.qml
+++ b/tests/baseline/data/principled/attenuation.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/basecolor.qml b/tests/baseline/data/principled/basecolor.qml
index 70a79b09..70a79b09 100644
--- a/tests/auto/quick3d_lancelot/data/principled/basecolor.qml
+++ b/tests/baseline/data/principled/basecolor.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/clearcoat.qml b/tests/baseline/data/principled/clearcoat.qml
index 48da3af6..48da3af6 100644
--- a/tests/auto/quick3d_lancelot/data/principled/clearcoat.qml
+++ b/tests/baseline/data/principled/clearcoat.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/depthDrawModes.qml b/tests/baseline/data/principled/depthDrawModes.qml
index 9796137f..9796137f 100644
--- a/tests/auto/quick3d_lancelot/data/principled/depthDrawModes.qml
+++ b/tests/baseline/data/principled/depthDrawModes.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/depthDrawModes_prepass.qml b/tests/baseline/data/principled/depthDrawModes_prepass.qml
index ef7b52b5..ef7b52b5 100644
--- a/tests/auto/quick3d_lancelot/data/principled/depthDrawModes_prepass.qml
+++ b/tests/baseline/data/principled/depthDrawModes_prepass.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/directional_light_dielectric_.qml b/tests/baseline/data/principled/directional_light_dielectric_.qml
index f1ae6990..f1ae6990 100644
--- a/tests/auto/quick3d_lancelot/data/principled/directional_light_dielectric_.qml
+++ b/tests/baseline/data/principled/directional_light_dielectric_.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/directional_light_dielectric_tinted.qml b/tests/baseline/data/principled/directional_light_dielectric_tinted.qml
index 31a55ad2..31a55ad2 100644
--- a/tests/auto/quick3d_lancelot/data/principled/directional_light_dielectric_tinted.qml
+++ b/tests/baseline/data/principled/directional_light_dielectric_tinted.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/directional_light_metallic.qml b/tests/baseline/data/principled/directional_light_metallic.qml
index 0f90c9d1..0f90c9d1 100644
--- a/tests/auto/quick3d_lancelot/data/principled/directional_light_metallic.qml
+++ b/tests/baseline/data/principled/directional_light_metallic.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/directional_light_mixed.qml b/tests/baseline/data/principled/directional_light_mixed.qml
index 64c5fa04..64c5fa04 100644
--- a/tests/auto/quick3d_lancelot/data/principled/directional_light_mixed.qml
+++ b/tests/baseline/data/principled/directional_light_mixed.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/ibl_dielectric.qml b/tests/baseline/data/principled/ibl_dielectric.qml
index 9156d853..9156d853 100644
--- a/tests/auto/quick3d_lancelot/data/principled/ibl_dielectric.qml
+++ b/tests/baseline/data/principled/ibl_dielectric.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/ibl_dielectric_tinted.qml b/tests/baseline/data/principled/ibl_dielectric_tinted.qml
index 4ca88c16..4ca88c16 100644
--- a/tests/auto/quick3d_lancelot/data/principled/ibl_dielectric_tinted.qml
+++ b/tests/baseline/data/principled/ibl_dielectric_tinted.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/ibl_metallic.qml b/tests/baseline/data/principled/ibl_metallic.qml
index cf375088..cf375088 100644
--- a/tests/auto/quick3d_lancelot/data/principled/ibl_metallic.qml
+++ b/tests/baseline/data/principled/ibl_metallic.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/ibl_mixed.qml b/tests/baseline/data/principled/ibl_mixed.qml
index db314e34..db314e34 100644
--- a/tests/auto/quick3d_lancelot/data/principled/ibl_mixed.qml
+++ b/tests/baseline/data/principled/ibl_mixed.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/ior.qml b/tests/baseline/data/principled/ior.qml
index f0ffe8b9..f0ffe8b9 100644
--- a/tests/auto/quick3d_lancelot/data/principled/ior.qml
+++ b/tests/baseline/data/principled/ior.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/metalness.qml b/tests/baseline/data/principled/metalness.qml
index 35fdc683..35fdc683 100644
--- a/tests/auto/quick3d_lancelot/data/principled/metalness.qml
+++ b/tests/baseline/data/principled/metalness.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/misc.qml b/tests/baseline/data/principled/misc.qml
index 7026737e..7026737e 100644
--- a/tests/auto/quick3d_lancelot/data/principled/misc.qml
+++ b/tests/baseline/data/principled/misc.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/normal.qml b/tests/baseline/data/principled/normal.qml
index d99cf4ee..d99cf4ee 100644
--- a/tests/auto/quick3d_lancelot/data/principled/normal.qml
+++ b/tests/baseline/data/principled/normal.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/occlusion.qml b/tests/baseline/data/principled/occlusion.qml
index 379a5a8b..379a5a8b 100644
--- a/tests/auto/quick3d_lancelot/data/principled/occlusion.qml
+++ b/tests/baseline/data/principled/occlusion.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/parallax_mapping.qml b/tests/baseline/data/principled/parallax_mapping.qml
index 61d8d2bb..61d8d2bb 100644
--- a/tests/auto/quick3d_lancelot/data/principled/parallax_mapping.qml
+++ b/tests/baseline/data/principled/parallax_mapping.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/point_light_dielectric.qml b/tests/baseline/data/principled/point_light_dielectric.qml
index 6db2dbc5..6db2dbc5 100644
--- a/tests/auto/quick3d_lancelot/data/principled/point_light_dielectric.qml
+++ b/tests/baseline/data/principled/point_light_dielectric.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/point_light_dielectric_tinted.qml b/tests/baseline/data/principled/point_light_dielectric_tinted.qml
index 9a472ecf..9a472ecf 100644
--- a/tests/auto/quick3d_lancelot/data/principled/point_light_dielectric_tinted.qml
+++ b/tests/baseline/data/principled/point_light_dielectric_tinted.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/point_light_metallic.qml b/tests/baseline/data/principled/point_light_metallic.qml
index 70e6f304..70e6f304 100644
--- a/tests/auto/quick3d_lancelot/data/principled/point_light_metallic.qml
+++ b/tests/baseline/data/principled/point_light_metallic.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/point_light_mixed.qml b/tests/baseline/data/principled/point_light_mixed.qml
index 808deb0e..808deb0e 100644
--- a/tests/auto/quick3d_lancelot/data/principled/point_light_mixed.qml
+++ b/tests/baseline/data/principled/point_light_mixed.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/principled_notexcoordmesh.qml b/tests/baseline/data/principled/principled_notexcoordmesh.qml
index ef897a70..ef897a70 100644
--- a/tests/auto/quick3d_lancelot/data/principled/principled_notexcoordmesh.qml
+++ b/tests/baseline/data/principled/principled_notexcoordmesh.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/roughness.qml b/tests/baseline/data/principled/roughness.qml
index b691fd4f..b691fd4f 100644
--- a/tests/auto/quick3d_lancelot/data/principled/roughness.qml
+++ b/tests/baseline/data/principled/roughness.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/specular.qml b/tests/baseline/data/principled/specular.qml
index c5af8592..c5af8592 100644
--- a/tests/auto/quick3d_lancelot/data/principled/specular.qml
+++ b/tests/baseline/data/principled/specular.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/spot_light_dielectric.qml b/tests/baseline/data/principled/spot_light_dielectric.qml
index 38b974d5..38b974d5 100644
--- a/tests/auto/quick3d_lancelot/data/principled/spot_light_dielectric.qml
+++ b/tests/baseline/data/principled/spot_light_dielectric.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/spot_light_dielectric_tinted.qml b/tests/baseline/data/principled/spot_light_dielectric_tinted.qml
index 5e6ab46b..5e6ab46b 100644
--- a/tests/auto/quick3d_lancelot/data/principled/spot_light_dielectric_tinted.qml
+++ b/tests/baseline/data/principled/spot_light_dielectric_tinted.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/spot_light_metallic.qml b/tests/baseline/data/principled/spot_light_metallic.qml
index c283d9e3..c283d9e3 100644
--- a/tests/auto/quick3d_lancelot/data/principled/spot_light_metallic.qml
+++ b/tests/baseline/data/principled/spot_light_metallic.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/spot_light_mixed.qml b/tests/baseline/data/principled/spot_light_mixed.qml
index d3f911be..d3f911be 100644
--- a/tests/auto/quick3d_lancelot/data/principled/spot_light_mixed.qml
+++ b/tests/baseline/data/principled/spot_light_mixed.qml
diff --git a/tests/auto/quick3d_lancelot/data/principled/transmission.qml b/tests/baseline/data/principled/transmission.qml
index 438aa310..438aa310 100644
--- a/tests/auto/quick3d_lancelot/data/principled/transmission.qml
+++ b/tests/baseline/data/principled/transmission.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/QmlstreamAnimated.qml b/tests/baseline/data/qml/QmlstreamAnimated.qml
index 0ea80d10..0ea80d10 100644
--- a/tests/auto/quick3d_lancelot/data/qml/QmlstreamAnimated.qml
+++ b/tests/baseline/data/qml/QmlstreamAnimated.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/QmlstreamContent.qml b/tests/baseline/data/qml/QmlstreamContent.qml
index 4ef05fb5..4ef05fb5 100644
--- a/tests/auto/quick3d_lancelot/data/qml/QmlstreamContent.qml
+++ b/tests/baseline/data/qml/QmlstreamContent.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/QmlstreamDynamic.qml b/tests/baseline/data/qml/QmlstreamDynamic.qml
index 6cbe6b4b..6cbe6b4b 100644
--- a/tests/auto/quick3d_lancelot/data/qml/QmlstreamDynamic.qml
+++ b/tests/baseline/data/qml/QmlstreamDynamic.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/SourceItem.qml b/tests/baseline/data/qml/SourceItem.qml
index 031d5aeb..031d5aeb 100644
--- a/tests/auto/quick3d_lancelot/data/qml/SourceItem.qml
+++ b/tests/baseline/data/qml/SourceItem.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/qml/AnimatedItem.qml b/tests/baseline/data/qml/qml/AnimatedItem.qml
index 7b2d62fb..7b2d62fb 100644
--- a/tests/auto/quick3d_lancelot/data/qml/qml/AnimatedItem.qml
+++ b/tests/baseline/data/qml/qml/AnimatedItem.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/qml/RedFill.qml b/tests/baseline/data/qml/qml/RedFill.qml
index 2fcf8236..2fcf8236 100644
--- a/tests/auto/quick3d_lancelot/data/qml/qml/RedFill.qml
+++ b/tests/baseline/data/qml/qml/RedFill.qml
diff --git a/tests/auto/quick3d_lancelot/data/qml/qml/qtlogo.png b/tests/baseline/data/qml/qml/qtlogo.png
index 28e40acd..28e40acd 100644
--- a/tests/auto/quick3d_lancelot/data/qml/qml/qtlogo.png
+++ b/tests/baseline/data/qml/qml/qtlogo.png
diff --git a/tests/auto/quick3d_lancelot/data/quick/Component.qml b/tests/baseline/data/quick/Component.qml
index f7cea7b0..f7cea7b0 100644
--- a/tests/auto/quick3d_lancelot/data/quick/Component.qml
+++ b/tests/baseline/data/quick/Component.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/DynamicCreation.qml b/tests/baseline/data/quick/DynamicCreation.qml
index 271d0adc..271d0adc 100644
--- a/tests/auto/quick3d_lancelot/data/quick/DynamicCreation.qml
+++ b/tests/baseline/data/quick/DynamicCreation.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/MultipleItems.qml b/tests/baseline/data/quick/MultipleItems.qml
index aa8eb78c..aa8eb78c 100644
--- a/tests/auto/quick3d_lancelot/data/quick/MultipleItems.qml
+++ b/tests/baseline/data/quick/MultipleItems.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/RenderModeInlineWithItem.qml b/tests/baseline/data/quick/RenderModeInlineWithItem.qml
index a404a613..a404a613 100644
--- a/tests/auto/quick3d_lancelot/data/quick/RenderModeInlineWithItem.qml
+++ b/tests/baseline/data/quick/RenderModeInlineWithItem.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/RenderModeOffscreenWithItem.qml b/tests/baseline/data/quick/RenderModeOffscreenWithItem.qml
index 17aaec46..17aaec46 100644
--- a/tests/auto/quick3d_lancelot/data/quick/RenderModeOffscreenWithItem.qml
+++ b/tests/baseline/data/quick/RenderModeOffscreenWithItem.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/RenderModeOverlayWithItem.qml b/tests/baseline/data/quick/RenderModeOverlayWithItem.qml
index 5ce7f775..5ce7f775 100644
--- a/tests/auto/quick3d_lancelot/data/quick/RenderModeOverlayWithItem.qml
+++ b/tests/baseline/data/quick/RenderModeOverlayWithItem.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/RenderingOrder.qml b/tests/baseline/data/quick/RenderingOrder.qml
index 4dab6edb..4dab6edb 100644
--- a/tests/auto/quick3d_lancelot/data/quick/RenderingOrder.qml
+++ b/tests/baseline/data/quick/RenderingOrder.qml
diff --git a/tests/auto/quick3d_lancelot/data/quick/Visibility.qml b/tests/baseline/data/quick/Visibility.qml
index 8cc2b2e2..8cc2b2e2 100644
--- a/tests/auto/quick3d_lancelot/data/quick/Visibility.qml
+++ b/tests/baseline/data/quick/Visibility.qml
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/MoreThanOneProbe.qml b/tests/baseline/data/reflectionprobe/MoreThanOneProbe.qml
index 810ba34d..810ba34d 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/MoreThanOneProbe.qml
+++ b/tests/baseline/data/reflectionprobe/MoreThanOneProbe.qml
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/OutsideOfProbe.qml b/tests/baseline/data/reflectionprobe/OutsideOfProbe.qml
index 92a5bfb3..92a5bfb3 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/OutsideOfProbe.qml
+++ b/tests/baseline/data/reflectionprobe/OutsideOfProbe.qml
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/ReceivesReflections.qml b/tests/baseline/data/reflectionprobe/ReceivesReflections.qml
index e78e628b..e78e628b 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/ReceivesReflections.qml
+++ b/tests/baseline/data/reflectionprobe/ReceivesReflections.qml
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/ThreeMaterialsType.qml b/tests/baseline/data/reflectionprobe/ThreeMaterialsType.qml
index 9e5491fb..9e5491fb 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/ThreeMaterialsType.qml
+++ b/tests/baseline/data/reflectionprobe/ThreeMaterialsType.qml
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/custom_shader.frag b/tests/baseline/data/reflectionprobe/custom_shader.frag
index 7fe169a4..7fe169a4 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/custom_shader.frag
+++ b/tests/baseline/data/reflectionprobe/custom_shader.frag
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/OpenfootageNET_garage-1024.hdr b/tests/baseline/data/reflectionprobe/maps/OpenfootageNET_garage-1024.hdr
index 01e9e38a..01e9e38a 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/OpenfootageNET_garage-1024.hdr
+++ b/tests/baseline/data/reflectionprobe/maps/OpenfootageNET_garage-1024.hdr
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/basecolor.jpg b/tests/baseline/data/reflectionprobe/maps/metallic/basecolor.jpg
index 44018274..44018274 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/basecolor.jpg
+++ b/tests/baseline/data/reflectionprobe/maps/metallic/basecolor.jpg
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/metallic.jpg b/tests/baseline/data/reflectionprobe/maps/metallic/metallic.jpg
index 6fe7b171..6fe7b171 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/metallic.jpg
+++ b/tests/baseline/data/reflectionprobe/maps/metallic/metallic.jpg
diff --git a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/roughness.jpg b/tests/baseline/data/reflectionprobe/maps/metallic/roughness.jpg
index f200e332..f200e332 100644
--- a/tests/auto/quick3d_lancelot/data/reflectionprobe/maps/metallic/roughness.jpg
+++ b/tests/baseline/data/reflectionprobe/maps/metallic/roughness.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shadows/CastReceiveShadow.qml b/tests/baseline/data/shadows/CastReceiveShadow.qml
index f18b6029..f18b6029 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/CastReceiveShadow.qml
+++ b/tests/baseline/data/shadows/CastReceiveShadow.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Directionallight.qml b/tests/baseline/data/shadows/Directionallight.qml
index 32dea7cf..32dea7cf 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Directionallight.qml
+++ b/tests/baseline/data/shadows/Directionallight.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightCameraFrustum.qml b/tests/baseline/data/shadows/DirectionallightCameraFrustum.qml
index 9665752f..9665752f 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightCameraFrustum.qml
+++ b/tests/baseline/data/shadows/DirectionallightCameraFrustum.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightCube.qml b/tests/baseline/data/shadows/DirectionallightCube.qml
index 8b944696..8b944696 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightCube.qml
+++ b/tests/baseline/data/shadows/DirectionallightCube.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightMultiNode.qml b/tests/baseline/data/shadows/DirectionallightMultiNode.qml
index eaa8321f..eaa8321f 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/DirectionallightMultiNode.qml
+++ b/tests/baseline/data/shadows/DirectionallightMultiNode.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/NoCastShadow.qml b/tests/baseline/data/shadows/NoCastShadow.qml
index 2325a1e4..2325a1e4 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/NoCastShadow.qml
+++ b/tests/baseline/data/shadows/NoCastShadow.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight.qml b/tests/baseline/data/shadows/Pointlight.qml
index 6c234166..6c234166 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight.qml
+++ b/tests/baseline/data/shadows/Pointlight.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_2.qml b/tests/baseline/data/shadows/Pointlight_2.qml
index 0727936e..0727936e 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_2.qml
+++ b/tests/baseline/data/shadows/Pointlight_2.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_custommaterial.qml b/tests/baseline/data/shadows/Pointlight_alpha_custommaterial.qml
index 77ae47d5..77ae47d5 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_custommaterial.qml
+++ b/tests/baseline/data/shadows/Pointlight_alpha_custommaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_defaultmaterial.qml b/tests/baseline/data/shadows/Pointlight_alpha_defaultmaterial.qml
index df92a156..df92a156 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_defaultmaterial.qml
+++ b/tests/baseline/data/shadows/Pointlight_alpha_defaultmaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_principledmaterial.qml b/tests/baseline/data/shadows/Pointlight_alpha_principledmaterial.qml
index 82cd0587..82cd0587 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_alpha_principledmaterial.qml
+++ b/tests/baseline/data/shadows/Pointlight_alpha_principledmaterial.qml
diff --git a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_nodepthprepass.qml b/tests/baseline/data/shadows/Pointlight_nodepthprepass.qml
index 796486b9..796486b9 100644
--- a/tests/auto/quick3d_lancelot/data/shadows/Pointlight_nodepthprepass.qml
+++ b/tests/baseline/data/shadows/Pointlight_nodepthprepass.qml
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/00455_OpenfootageNET_field_low_resized.png b/tests/baseline/data/shared/maps/00455_OpenfootageNET_field_low_resized.png
index 8305270f..8305270f 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/00455_OpenfootageNET_field_low_resized.png
+++ b/tests/baseline/data/shared/maps/00455_OpenfootageNET_field_low_resized.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/AttenuationLabels.png b/tests/baseline/data/shared/maps/AttenuationLabels.png
index 35c1673d..35c1673d 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/AttenuationLabels.png
+++ b/tests/baseline/data/shared/maps/AttenuationLabels.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/GridWithDetails.png b/tests/baseline/data/shared/maps/GridWithDetails.png
index 2871553d..2871553d 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/GridWithDetails.png
+++ b/tests/baseline/data/shared/maps/GridWithDetails.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/IOR_Labels.png b/tests/baseline/data/shared/maps/IOR_Labels.png
index e8a421cd..e8a421cd 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/IOR_Labels.png
+++ b/tests/baseline/data/shared/maps/IOR_Labels.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/OpenfootageNET_lowerAustria01-1024.hdr b/tests/baseline/data/shared/maps/OpenfootageNET_lowerAustria01-1024.hdr
index ac513a4b..ac513a4b 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/OpenfootageNET_lowerAustria01-1024.hdr
+++ b/tests/baseline/data/shared/maps/OpenfootageNET_lowerAustria01-1024.hdr
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/PartialCoating.png b/tests/baseline/data/shared/maps/PartialCoating.png
index 97371081..97371081 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/PartialCoating.png
+++ b/tests/baseline/data/shared/maps/PartialCoating.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/PartialCoating_Alpha.png b/tests/baseline/data/shared/maps/PartialCoating_Alpha.png
index 2c9af0a4..2c9af0a4 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/PartialCoating_Alpha.png
+++ b/tests/baseline/data/shared/maps/PartialCoating_Alpha.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/PlainGrid.png b/tests/baseline/data/shared/maps/PlainGrid.png
index 56cd2770..56cd2770 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/PlainGrid.png
+++ b/tests/baseline/data/shared/maps/PlainGrid.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/PlasticWrap_normals.png b/tests/baseline/data/shared/maps/PlasticWrap_normals.png
index d651f909..d651f909 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/PlasticWrap_normals.png
+++ b/tests/baseline/data/shared/maps/PlasticWrap_normals.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/RibsNormal.png b/tests/baseline/data/shared/maps/RibsNormal.png
index a1970764..a1970764 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/RibsNormal.png
+++ b/tests/baseline/data/shared/maps/RibsNormal.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessGrid-1.png b/tests/baseline/data/shared/maps/RoughnessGrid-1.png
index 15298cbb..15298cbb 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessGrid-1.png
+++ b/tests/baseline/data/shared/maps/RoughnessGrid-1.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessGrid.png b/tests/baseline/data/shared/maps/RoughnessGrid.png
index a5ffb520..a5ffb520 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessGrid.png
+++ b/tests/baseline/data/shared/maps/RoughnessGrid.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessStripes.png b/tests/baseline/data/shared/maps/RoughnessStripes.png
index 021074af..021074af 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/RoughnessStripes.png
+++ b/tests/baseline/data/shared/maps/RoughnessStripes.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/SmoothVsRough.png b/tests/baseline/data/shared/maps/SmoothVsRough.png
index 58b610a6..58b610a6 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/SmoothVsRough.png
+++ b/tests/baseline/data/shared/maps/SmoothVsRough.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/TestEnvironment-512.exr b/tests/baseline/data/shared/maps/TestEnvironment-512.exr
index 324146ee..324146ee 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/TestEnvironment-512.exr
+++ b/tests/baseline/data/shared/maps/TestEnvironment-512.exr
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/TestEnvironment-512.hdr b/tests/baseline/data/shared/maps/TestEnvironment-512.hdr
index 5885a917..5885a917 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/TestEnvironment-512.hdr
+++ b/tests/baseline/data/shared/maps/TestEnvironment-512.hdr
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/ThicknessTexture.png b/tests/baseline/data/shared/maps/ThicknessTexture.png
index 8f2114ff..8f2114ff 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/ThicknessTexture.png
+++ b/tests/baseline/data/shared/maps/ThicknessTexture.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/alphaMode_rgba.png b/tests/baseline/data/shared/maps/alphaMode_rgba.png
index ca7c9bf2..ca7c9bf2 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/alphaMode_rgba.png
+++ b/tests/baseline/data/shared/maps/alphaMode_rgba.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/checkerboard_1.png b/tests/baseline/data/shared/maps/checkerboard_1.png
index d08883fa..d08883fa 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/checkerboard_1.png
+++ b/tests/baseline/data/shared/maps/checkerboard_1.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/checkerboard_2.png b/tests/baseline/data/shared/maps/checkerboard_2.png
index 505b8ad9..505b8ad9 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/checkerboard_2.png
+++ b/tests/baseline/data/shared/maps/checkerboard_2.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/checkers1.png b/tests/baseline/data/shared/maps/checkers1.png
index 191ab3ae..191ab3ae 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/checkers1.png
+++ b/tests/baseline/data/shared/maps/checkers1.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/checkers2.png b/tests/baseline/data/shared/maps/checkers2.png
index b23f805e..b23f805e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/checkers2.png
+++ b/tests/baseline/data/shared/maps/checkers2.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negx.jpg b/tests/baseline/data/shared/maps/clouds1_negx.jpg
index 8c8306bf..8c8306bf 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negx.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_negx.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negy.jpg b/tests/baseline/data/shared/maps/clouds1_negy.jpg
index de818e68..de818e68 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negy.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_negy.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negz.jpg b/tests/baseline/data/shared/maps/clouds1_negz.jpg
index 84d0fca3..84d0fca3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_negz.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_negz.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posx.jpg b/tests/baseline/data/shared/maps/clouds1_posx.jpg
index fdf2cb51..fdf2cb51 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posx.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_posx.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posy.jpg b/tests/baseline/data/shared/maps/clouds1_posy.jpg
index ac8ead2a..ac8ead2a 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posy.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_posy.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posz.jpg b/tests/baseline/data/shared/maps/clouds1_posz.jpg
index 9a27454b..9a27454b 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/clouds1_posz.jpg
+++ b/tests/baseline/data/shared/maps/clouds1_posz.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/corrupt.png b/tests/baseline/data/shared/maps/corrupt.png
index cf494947..cf494947 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/corrupt.png
+++ b/tests/baseline/data/shared/maps/corrupt.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/cubemap_bc1.ktx b/tests/baseline/data/shared/maps/cubemap_bc1.ktx
index dc130f66..dc130f66 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/cubemap_bc1.ktx
+++ b/tests/baseline/data/shared/maps/cubemap_bc1.ktx
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/fishpond_bc1.ktx b/tests/baseline/data/shared/maps/fishpond_bc1.ktx
index 86bba4fc..86bba4fc 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/fishpond_bc1.ktx
+++ b/tests/baseline/data/shared/maps/fishpond_bc1.ktx
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/fishpond_bc1.txt b/tests/baseline/data/shared/maps/fishpond_bc1.txt
index 8b404c27..8b404c27 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/fishpond_bc1.txt
+++ b/tests/baseline/data/shared/maps/fishpond_bc1.txt
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/heightmap.png b/tests/baseline/data/shared/maps/heightmap.png
index 629ddd5e..629ddd5e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/heightmap.png
+++ b/tests/baseline/data/shared/maps/heightmap.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/miptester_etc2.ktx b/tests/baseline/data/shared/maps/miptester_etc2.ktx
index bc3d384a..bc3d384a 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/miptester_etc2.ktx
+++ b/tests/baseline/data/shared/maps/miptester_etc2.ktx
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/o1_bc1.ktx b/tests/baseline/data/shared/maps/o1_bc1.ktx
index d61194a7..d61194a7 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/o1_bc1.ktx
+++ b/tests/baseline/data/shared/maps/o1_bc1.ktx
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/o1_bc1.png b/tests/baseline/data/shared/maps/o1_bc1.png
index 6c94085e..6c94085e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/o1_bc1.png
+++ b/tests/baseline/data/shared/maps/o1_bc1.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/opacitymap.png b/tests/baseline/data/shared/maps/opacitymap.png
index c349e4de..c349e4de 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/opacitymap.png
+++ b/tests/baseline/data/shared/maps/opacitymap.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/oulu_2.jpeg b/tests/baseline/data/shared/maps/oulu_2.jpeg
index 8809cc05..8809cc05 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/oulu_2.jpeg
+++ b/tests/baseline/data/shared/maps/oulu_2.jpeg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/rgba.png b/tests/baseline/data/shared/maps/rgba.png
index 7b43637e..7b43637e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/rgba.png
+++ b/tests/baseline/data/shared/maps/rgba.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/t2.png b/tests/baseline/data/shared/maps/t2.png
index 59fca9eb..59fca9eb 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/t2.png
+++ b/tests/baseline/data/shared/maps/t2.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/t2_bc2.ktx b/tests/baseline/data/shared/maps/t2_bc2.ktx
index fc9ac084..fc9ac084 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/t2_bc2.ktx
+++ b/tests/baseline/data/shared/maps/t2_bc2.ktx
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture10487.png b/tests/baseline/data/shared/maps/texture10487.png
index 1e08ae0f..1e08ae0f 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture10487.png
+++ b/tests/baseline/data/shared/maps/texture10487.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture14184.jpg b/tests/baseline/data/shared/maps/texture14184.jpg
index 8781e8a1..8781e8a1 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture14184.jpg
+++ b/tests/baseline/data/shared/maps/texture14184.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture175763.png b/tests/baseline/data/shared/maps/texture175763.png
index 6742f66b..6742f66b 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture175763.png
+++ b/tests/baseline/data/shared/maps/texture175763.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture177328.png b/tests/baseline/data/shared/maps/texture177328.png
index 623d7eca..623d7eca 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture177328.png
+++ b/tests/baseline/data/shared/maps/texture177328.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture214190.png b/tests/baseline/data/shared/maps/texture214190.png
index 959bf3fe..959bf3fe 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture214190.png
+++ b/tests/baseline/data/shared/maps/texture214190.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture28577.jpg b/tests/baseline/data/shared/maps/texture28577.jpg
index 477384ac..477384ac 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture28577.jpg
+++ b/tests/baseline/data/shared/maps/texture28577.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture4086.png b/tests/baseline/data/shared/maps/texture4086.png
index a60fa992..a60fa992 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture4086.png
+++ b/tests/baseline/data/shared/maps/texture4086.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture6807.png b/tests/baseline/data/shared/maps/texture6807.png
index b578ce4a..b578ce4a 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture6807.png
+++ b/tests/baseline/data/shared/maps/texture6807.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/texture_withAlpha.png b/tests/baseline/data/shared/maps/texture_withAlpha.png
index dd6ded5d..dd6ded5d 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/texture_withAlpha.png
+++ b/tests/baseline/data/shared/maps/texture_withAlpha.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/maps/wrinkles_normal.jpg b/tests/baseline/data/shared/maps/wrinkles_normal.jpg
index 0f688a6d..0f688a6d 100644
--- a/tests/auto/quick3d_lancelot/data/shared/maps/wrinkles_normal.jpg
+++ b/tests/baseline/data/shared/maps/wrinkles_normal.jpg
diff --git a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice.qml b/tests/baseline/data/shared/materials/GoldLattice.qml
index 8bc8c580..8bc8c580 100644
--- a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice.qml
+++ b/tests/baseline/data/shared/materials/GoldLattice.qml
diff --git a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_baseColor.png b/tests/baseline/data/shared/materials/GoldLattice_baseColor.png
index 5076ff2e..5076ff2e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_baseColor.png
+++ b/tests/baseline/data/shared/materials/GoldLattice_baseColor.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_height.png b/tests/baseline/data/shared/materials/GoldLattice_height.png
index 4ac542cd..4ac542cd 100644
--- a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_height.png
+++ b/tests/baseline/data/shared/materials/GoldLattice_height.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_normal.png b/tests/baseline/data/shared/materials/GoldLattice_normal.png
index 4aa67d03..4aa67d03 100644
--- a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_normal.png
+++ b/tests/baseline/data/shared/materials/GoldLattice_normal.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_occlusionRoughnessMetallic.png b/tests/baseline/data/shared/materials/GoldLattice_occlusionRoughnessMetallic.png
index 5732df70..5732df70 100644
--- a/tests/auto/quick3d_lancelot/data/shared/materials/GoldLattice_occlusionRoughnessMetallic.png
+++ b/tests/baseline/data/shared/materials/GoldLattice_occlusionRoughnessMetallic.png
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/InvertedSphere.mesh b/tests/baseline/data/shared/models/InvertedSphere.mesh
index 21da0380..21da0380 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/InvertedSphere.mesh
+++ b/tests/baseline/data/shared/models/InvertedSphere.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/animal_with_lightmapuv1.mesh b/tests/baseline/data/shared/models/animal_with_lightmapuv1.mesh
index 093919ce..093919ce 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/animal_with_lightmapuv1.mesh
+++ b/tests/baseline/data/shared/models/animal_with_lightmapuv1.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/labels.mesh b/tests/baseline/data/shared/models/attenuation/labels.mesh
index 070ae139..070ae139 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/labels.mesh
+++ b/tests/baseline/data/shared/models/attenuation/labels.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/meterGrid.mesh b/tests/baseline/data/shared/models/attenuation/meterGrid.mesh
index b780750c..b780750c 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/meterGrid.mesh
+++ b/tests/baseline/data/shared/models/attenuation/meterGrid.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_0_25.mesh b/tests/baseline/data/shared/models/attenuation/r1_Sample_0_25.mesh
index 09290c65..09290c65 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_0_25.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r1_Sample_0_25.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_0_50.mesh b/tests/baseline/data/shared/models/attenuation/r1_Sample_0_50.mesh
index 5216553b..5216553b 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_0_50.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r1_Sample_0_50.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_1_0.mesh b/tests/baseline/data/shared/models/attenuation/r1_Sample_1_0.mesh
index ef2697b3..ef2697b3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_1_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r1_Sample_1_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_1_5.mesh b/tests/baseline/data/shared/models/attenuation/r1_Sample_1_5.mesh
index 2f7cac20..2f7cac20 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_1_5.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r1_Sample_1_5.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_2_0.mesh b/tests/baseline/data/shared/models/attenuation/r1_Sample_2_0.mesh
index a5f2e6a2..a5f2e6a2 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r1_Sample_2_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r1_Sample_2_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_0_25.mesh b/tests/baseline/data/shared/models/attenuation/r2_Block_0_25.mesh
index 1880435e..1880435e 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_0_25.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r2_Block_0_25.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_0_50.mesh b/tests/baseline/data/shared/models/attenuation/r2_Block_0_50.mesh
index 647468a8..647468a8 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_0_50.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r2_Block_0_50.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_1_0.mesh b/tests/baseline/data/shared/models/attenuation/r2_Block_1_0.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_1_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r2_Block_1_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_1_5.mesh b/tests/baseline/data/shared/models/attenuation/r2_Block_1_5.mesh
index 1ead03c7..1ead03c7 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_1_5.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r2_Block_1_5.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_2_0.mesh b/tests/baseline/data/shared/models/attenuation/r2_Block_2_0.mesh
index 374fd324..374fd324 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r2_Block_2_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r2_Block_2_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r3_Block_Row.mesh b/tests/baseline/data/shared/models/attenuation/r3_Block_Row.mesh
index a68ae6fa..a68ae6fa 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r3_Block_Row.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r3_Block_Row.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_0_25.mesh b/tests/baseline/data/shared/models/attenuation/r4_Block_0_25.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_0_25.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r4_Block_0_25.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_0_50.mesh b/tests/baseline/data/shared/models/attenuation/r4_Block_0_50.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_0_50.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r4_Block_0_50.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_1_0.mesh b/tests/baseline/data/shared/models/attenuation/r4_Block_1_0.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_1_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r4_Block_1_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_1_5.mesh b/tests/baseline/data/shared/models/attenuation/r4_Block_1_5.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_1_5.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r4_Block_1_5.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_2_0.mesh b/tests/baseline/data/shared/models/attenuation/r4_Block_2_0.mesh
index 495424c3..495424c3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r4_Block_2_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r4_Block_2_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_0_25.mesh b/tests/baseline/data/shared/models/attenuation/r5_Block_0_25.mesh
index d46bb3ba..d46bb3ba 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_0_25.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r5_Block_0_25.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_0_50.mesh b/tests/baseline/data/shared/models/attenuation/r5_Block_0_50.mesh
index 5618ace6..5618ace6 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_0_50.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r5_Block_0_50.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_1_0.mesh b/tests/baseline/data/shared/models/attenuation/r5_Block_1_0.mesh
index 2f5a49d7..2f5a49d7 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_1_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r5_Block_1_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_1_5.mesh b/tests/baseline/data/shared/models/attenuation/r5_Block_1_5.mesh
index 48f342b0..48f342b0 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_1_5.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r5_Block_1_5.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_2_0.mesh b/tests/baseline/data/shared/models/attenuation/r5_Block_2_0.mesh
index 226ad953..226ad953 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/attenuation/r5_Block_2_0.mesh
+++ b/tests/baseline/data/shared/models/attenuation/r5_Block_2_0.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/ball.mesh b/tests/baseline/data/shared/models/ball.mesh
index 60cefdc0..60cefdc0 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/ball.mesh
+++ b/tests/baseline/data/shared/models/ball.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/barrel/meshes/Barrel.mesh b/tests/baseline/data/shared/models/barrel/meshes/Barrel.mesh
index 3f0a9231..3f0a9231 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/barrel/meshes/Barrel.mesh
+++ b/tests/baseline/data/shared/models/barrel/meshes/Barrel.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/baseLayerSample.mesh b/tests/baseline/data/shared/models/baseLayerSample.mesh
index 8f0d2db7..8f0d2db7 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/baseLayerSample.mesh
+++ b/tests/baseline/data/shared/models/baseLayerSample.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/carCombined.mesh b/tests/baseline/data/shared/models/carCombined.mesh
index e38a7aab..e38a7aab 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/carCombined.mesh
+++ b/tests/baseline/data/shared/models/carCombined.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/cloth_Backdrop_01.mesh b/tests/baseline/data/shared/models/cloth_Backdrop_01.mesh
index 5aa840a4..5aa840a4 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/cloth_Backdrop_01.mesh
+++ b/tests/baseline/data/shared/models/cloth_Backdrop_01.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/cube_uv2.mesh b/tests/baseline/data/shared/models/cube_uv2.mesh
index fbd78c87..fbd78c87 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/cube_uv2.mesh
+++ b/tests/baseline/data/shared/models/cube_uv2.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/distortedcube.mesh b/tests/baseline/data/shared/models/distortedcube.mesh
index 5707b52b..5707b52b 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/distortedcube.mesh
+++ b/tests/baseline/data/shared/models/distortedcube.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/ior/flat_Backdrop.mesh b/tests/baseline/data/shared/models/ior/flat_Backdrop.mesh
index b45a1172..b45a1172 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/ior/flat_Backdrop.mesh
+++ b/tests/baseline/data/shared/models/ior/flat_Backdrop.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/ior/labels.mesh b/tests/baseline/data/shared/models/ior/labels.mesh
index d297b018..d297b018 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/ior/labels.mesh
+++ b/tests/baseline/data/shared/models/ior/labels.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/ior/opaque.mesh b/tests/baseline/data/shared/models/ior/opaque.mesh
index 1690a0bb..1690a0bb 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/ior/opaque.mesh
+++ b/tests/baseline/data/shared/models/ior/opaque.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/ior/smoothRoughLabels.mesh b/tests/baseline/data/shared/models/ior/smoothRoughLabels.mesh
index f02f19d4..f02f19d4 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/ior/smoothRoughLabels.mesh
+++ b/tests/baseline/data/shared/models/ior/smoothRoughLabels.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/monkey_object.mesh b/tests/baseline/data/shared/models/monkey_object.mesh
index 860136b1..860136b1 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/monkey_object.mesh
+++ b/tests/baseline/data/shared/models/monkey_object.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/plane.mesh b/tests/baseline/data/shared/models/plane.mesh
index 1efc57fa..1efc57fa 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/plane.mesh
+++ b/tests/baseline/data/shared/models/plane.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/suzanne.mesh b/tests/baseline/data/shared/models/suzanne.mesh
index dee5cff3..dee5cff3 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/suzanne.mesh
+++ b/tests/baseline/data/shared/models/suzanne.mesh
diff --git a/tests/auto/quick3d_lancelot/data/shared/models/teapot_without_texcoords.mesh b/tests/baseline/data/shared/models/teapot_without_texcoords.mesh
index 75ff3177..75ff3177 100644
--- a/tests/auto/quick3d_lancelot/data/shared/models/teapot_without_texcoords.mesh
+++ b/tests/baseline/data/shared/models/teapot_without_texcoords.mesh
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple.qml b/tests/baseline/data/skinanim/skinsimple.qml
index a2d47313..a2d47313 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple.qml
+++ b/tests/baseline/data/skinanim/skinsimple.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple2.qml b/tests/baseline/data/skinanim/skinsimple2.qml
index 0366e701..0366e701 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple2.qml
+++ b/tests/baseline/data/skinanim/skinsimple2.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.frag b/tests/baseline/data/skinanim/skinsimple_custom_shaded.frag
index 1a65aefb..1a65aefb 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.frag
+++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded.frag
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.qml b/tests/baseline/data/skinanim/skinsimple_custom_shaded.qml
index f0e47ed6..f0e47ed6 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.qml
+++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.vert b/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert
index ec39f1a2..ec39f1a2 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded.vert
+++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded.vert
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded2.frag b/tests/baseline/data/skinanim/skinsimple_custom_shaded2.frag
index 5915a843..5915a843 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded2.frag
+++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded2.frag
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded2.qml b/tests/baseline/data/skinanim/skinsimple_custom_shaded2.qml
index 9b7347b8..9b7347b8 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_shaded2.qml
+++ b/tests/baseline/data/skinanim/skinsimple_custom_shaded2.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.frag b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.frag
index 6fda7a4a..6fda7a4a 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.frag
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.frag
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.qml b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.qml
index 61ddb6d9..61ddb6d9 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.qml
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.vert b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert
index e438aac2..e438aac2 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded.vert
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded.vert
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.frag b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.frag
index 4b4bef92..4b4bef92 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.frag
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.frag
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.qml b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.qml
index cff606b7..cff606b7 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.qml
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.qml
diff --git a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.vert b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.vert
index 7ed9184d..7ed9184d 100644
--- a/tests/auto/quick3d_lancelot/data/skinanim/skinsimple_custom_unshaded2.vert
+++ b/tests/baseline/data/skinanim/skinsimple_custom_unshaded2.vert
diff --git a/tests/auto/quick3d_lancelot/data/submeshes/onetomany.qml b/tests/baseline/data/submeshes/onetomany.qml
index da044c6c..da044c6c 100644
--- a/tests/auto/quick3d_lancelot/data/submeshes/onetomany.qml
+++ b/tests/baseline/data/submeshes/onetomany.qml
diff --git a/tests/auto/quick3d_lancelot/data/submeshes/onetoone.qml b/tests/baseline/data/submeshes/onetoone.qml
index 8fa8c9ec..8fa8c9ec 100644
--- a/tests/auto/quick3d_lancelot/data/submeshes/onetoone.qml
+++ b/tests/baseline/data/submeshes/onetoone.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/Envmap.qml b/tests/baseline/data/textures/Envmap.qml
index 215ed6d1..215ed6d1 100644
--- a/tests/auto/quick3d_lancelot/data/textures/Envmap.qml
+++ b/tests/baseline/data/textures/Envmap.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/Image_params_1.qml b/tests/baseline/data/textures/Image_params_1.qml
index 9979d69f..9979d69f 100644
--- a/tests/auto/quick3d_lancelot/data/textures/Image_params_1.qml
+++ b/tests/baseline/data/textures/Image_params_1.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/Image_params_2.qml b/tests/baseline/data/textures/Image_params_2.qml
index 9a28874e..9a28874e 100644
--- a/tests/auto/quick3d_lancelot/data/textures/Image_params_2.qml
+++ b/tests/baseline/data/textures/Image_params_2.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/Image_params_control.qml b/tests/baseline/data/textures/Image_params_control.qml
index feedb159..feedb159 100644
--- a/tests/auto/quick3d_lancelot/data/textures/Image_params_control.qml
+++ b/tests/baseline/data/textures/Image_params_control.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/Opacitymap.qml b/tests/baseline/data/textures/Opacitymap.qml
index e5fbb19d..e5fbb19d 100644
--- a/tests/auto/quick3d_lancelot/data/textures/Opacitymap.qml
+++ b/tests/baseline/data/textures/Opacitymap.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/autoorientation.qml b/tests/baseline/data/textures/autoorientation.qml
index 2823d3c3..2823d3c3 100644
--- a/tests/auto/quick3d_lancelot/data/textures/autoorientation.qml
+++ b/tests/baseline/data/textures/autoorientation.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/compressed.qml b/tests/baseline/data/textures/compressed.qml
index 76f6d9c9..76f6d9c9 100644
--- a/tests/auto/quick3d_lancelot/data/textures/compressed.qml
+++ b/tests/baseline/data/textures/compressed.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/compressed_mipmaps.qml b/tests/baseline/data/textures/compressed_mipmaps.qml
index e3601980..e3601980 100644
--- a/tests/auto/quick3d_lancelot/data/textures/compressed_mipmaps.qml
+++ b/tests/baseline/data/textures/compressed_mipmaps.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/envmap2.qml b/tests/baseline/data/textures/envmap2.qml
index c20aa40a..c20aa40a 100644
--- a/tests/auto/quick3d_lancelot/data/textures/envmap2.qml
+++ b/tests/baseline/data/textures/envmap2.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/envmap3.qml b/tests/baseline/data/textures/envmap3.qml
index e9b14b10..e9b14b10 100644
--- a/tests/auto/quick3d_lancelot/data/textures/envmap3.qml
+++ b/tests/baseline/data/textures/envmap3.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/extensions.qml b/tests/baseline/data/textures/extensions.qml
index 7d702774..7d702774 100644
--- a/tests/auto/quick3d_lancelot/data/textures/extensions.qml
+++ b/tests/baseline/data/textures/extensions.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/uv1.qml b/tests/baseline/data/textures/uv1.qml
index e693f234..e693f234 100644
--- a/tests/auto/quick3d_lancelot/data/textures/uv1.qml
+++ b/tests/baseline/data/textures/uv1.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/uvflip.qml b/tests/baseline/data/textures/uvflip.qml
index 82cddea3..82cddea3 100644
--- a/tests/auto/quick3d_lancelot/data/textures/uvflip.qml
+++ b/tests/baseline/data/textures/uvflip.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/view3d_as_texture_in_view3d.qml b/tests/baseline/data/textures/view3d_as_texture_in_view3d.qml
index 46316f41..46316f41 100644
--- a/tests/auto/quick3d_lancelot/data/textures/view3d_as_texture_in_view3d.qml
+++ b/tests/baseline/data/textures/view3d_as_texture_in_view3d.qml
diff --git a/tests/auto/quick3d_lancelot/data/textures/view3d_as_texture_in_view3d_change.qml b/tests/baseline/data/textures/view3d_as_texture_in_view3d_change.qml
index ff3f601a..ff3f601a 100644
--- a/tests/auto/quick3d_lancelot/data/textures/view3d_as_texture_in_view3d_change.qml
+++ b/tests/baseline/data/textures/view3d_as_texture_in_view3d_change.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/ActiveCamera.qml b/tests/baseline/data/view3d/ActiveCamera.qml
index a58209a8..a58209a8 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/ActiveCamera.qml
+++ b/tests/baseline/data/view3d/ActiveCamera.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/AntiAliasing.qml b/tests/baseline/data/view3d/AntiAliasing.qml
index 3819956c..3819956c 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/AntiAliasing.qml
+++ b/tests/baseline/data/view3d/AntiAliasing.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/ClearModeColor.qml b/tests/baseline/data/view3d/ClearModeColor.qml
index f6e7f4ed..f6e7f4ed 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/ClearModeColor.qml
+++ b/tests/baseline/data/view3d/ClearModeColor.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/ClearModeSkyBox.qml b/tests/baseline/data/view3d/ClearModeSkyBox.qml
index 76420acc..76420acc 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/ClearModeSkyBox.qml
+++ b/tests/baseline/data/view3d/ClearModeSkyBox.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/ClearModeSkyBoxCubeMap.qml b/tests/baseline/data/view3d/ClearModeSkyBoxCubeMap.qml
index 49e4ef19..49e4ef19 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/ClearModeSkyBoxCubeMap.qml
+++ b/tests/baseline/data/view3d/ClearModeSkyBoxCubeMap.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/ClearModeTransparent.qml b/tests/baseline/data/view3d/ClearModeTransparent.qml
index c432c2a2..c432c2a2 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/ClearModeTransparent.qml
+++ b/tests/baseline/data/view3d/ClearModeTransparent.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml b/tests/baseline/data/view3d/MultipleViews.qml
index ca812014..ca812014 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml
+++ b/tests/baseline/data/view3d/MultipleViews.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews2.qml b/tests/baseline/data/view3d/MultipleViews2.qml
index 2d9f0722..2d9f0722 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews2.qml
+++ b/tests/baseline/data/view3d/MultipleViews2.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews_Item2D.qml b/tests/baseline/data/view3d/MultipleViews_Item2D.qml
index b58911ef..b58911ef 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews_Item2D.qml
+++ b/tests/baseline/data/view3d/MultipleViews_Item2D.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/NoSize.qml b/tests/baseline/data/view3d/NoSize.qml
index 6d1ee9db..6d1ee9db 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/NoSize.qml
+++ b/tests/baseline/data/view3d/NoSize.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeInline.qml b/tests/baseline/data/view3d/RenderModeInline.qml
index 1b7b313d..1b7b313d 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeInline.qml
+++ b/tests/baseline/data/view3d/RenderModeInline.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml b/tests/baseline/data/view3d/RenderModeMultiple.qml
index 4c8fe410..4c8fe410 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml
+++ b/tests/baseline/data/view3d/RenderModeMultiple.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeOverlay.qml b/tests/baseline/data/view3d/RenderModeOverlay.qml
index 0a74e8c9..0a74e8c9 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeOverlay.qml
+++ b/tests/baseline/data/view3d/RenderModeOverlay.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeTexture.qml b/tests/baseline/data/view3d/RenderModeTexture.qml
index 40e313bc..40e313bc 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeTexture.qml
+++ b/tests/baseline/data/view3d/RenderModeTexture.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeUnderlay.qml b/tests/baseline/data/view3d/RenderModeUnderlay.qml
index 64091b07..64091b07 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeUnderlay.qml
+++ b/tests/baseline/data/view3d/RenderModeUnderlay.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml b/tests/baseline/data/view3d/SceneComponent.qml
index 5bd1ee23..5bd1ee23 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml
+++ b/tests/baseline/data/view3d/SceneComponent.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/SceneEffects.qml b/tests/baseline/data/view3d/SceneEffects.qml
index 8f166844..8f166844 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/SceneEffects.qml
+++ b/tests/baseline/data/view3d/SceneEffects.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/SharedResources.qml b/tests/baseline/data/view3d/SharedResources.qml
index a733d3e7..a733d3e7 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/SharedResources.qml
+++ b/tests/baseline/data/view3d/SharedResources.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/SharedResources2.qml b/tests/baseline/data/view3d/SharedResources2.qml
index 57c1c9ee..57c1c9ee 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/SharedResources2.qml
+++ b/tests/baseline/data/view3d/SharedResources2.qml
diff --git a/tests/auto/quick3d_lancelot/quick3d/CMakeLists.txt b/tests/baseline/quick3d/CMakeLists.txt
index 5d7852f8..215b5ca2 100644
--- a/tests/auto/quick3d_lancelot/quick3d/CMakeLists.txt
+++ b/tests/baseline/quick3d/CMakeLists.txt
@@ -9,18 +9,21 @@
 
 # Collect test data
 list(APPEND test_data "../data")
+set(BASELINE_DIR "../../../../qtbase/tests/baseline/shared")
 
-qt_internal_add_test(tst_qquick3d
+qt_internal_add_test(tst_baseline_qquick3d
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
     SOURCES
-        ../shared/baselineprotocol.cpp ../shared/baselineprotocol.h
-        ../shared/lookup3.cpp
-        ../shared/qbaselinetest.cpp ../shared/qbaselinetest.h
-        tst_quick3d.cpp
+        ${BASELINE_DIR}/baselineprotocol.cpp
+        ${BASELINE_DIR}/baselineprotocol.h
+        ${BASELINE_DIR}/lookup3.cpp
+        ${BASELINE_DIR}/qbaselinetest.cpp
+        ${BASELINE_DIR}/qbaselinetest.h
+        tst_baseline_quick3d.cpp
     DEFINES
         QMAKESPEC=""
     INCLUDE_DIRECTORIES
-        ../shared
+        ${BASELINE_DIR}
     LIBRARIES
         Qt::Gui
         Qt::Network
@@ -28,8 +31,8 @@ qt_internal_add_test(tst_qquick3d
 )
 
 # special case begin
-add_dependencies(tst_qquick3d Qt6::Quick3D)
-add_dependencies(tst_qquick3d qquick3d_qmlscenegrabber)
+add_dependencies(tst_baseline_qquick3d Qt6::Quick3D)
+add_dependencies(tst_baseline_qquick3d qquick3d_qmlscenegrabber)
 # special case end
 
 ## Scopes:
diff --git a/tests/auto/quick3d_lancelot/quick3d/tst_quick3d.cpp b/tests/baseline/quick3d/tst_baseline_quick3d.cpp
index b4929f8a..6aac9cc2 100644
--- a/tests/auto/quick3d_lancelot/quick3d/tst_quick3d.cpp
+++ b/tests/baseline/quick3d/tst_baseline_quick3d.cpp
@@ -240,4 +240,4 @@ int main(int argc, char *argv[])
     return _realmain(argc, argv);
 }
 
-#include "tst_quick3d.moc"
+#include "tst_baseline_quick3d.moc"
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/CMakeLists.txt b/tests/baseline/scenegrabber/CMakeLists.txt
index 7b5b27cb..7b5b27cb 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/baseline/scenegrabber/CMakeLists.txt
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/dynamicgeometry.cpp b/tests/baseline/scenegrabber/dynamicgeometry.cpp
index 0f1c9b14..0f1c9b14 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/dynamicgeometry.cpp
+++ b/tests/baseline/scenegrabber/dynamicgeometry.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/dynamicgeometry.h b/tests/baseline/scenegrabber/dynamicgeometry.h
index c14e9ca8..c14e9ca8 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/dynamicgeometry.h
+++ b/tests/baseline/scenegrabber/dynamicgeometry.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/dynamictexturedata.cpp b/tests/baseline/scenegrabber/dynamictexturedata.cpp
index 536f1f01..536f1f01 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/dynamictexturedata.cpp
+++ b/tests/baseline/scenegrabber/dynamictexturedata.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/dynamictexturedata.h b/tests/baseline/scenegrabber/dynamictexturedata.h
index 7dcdf211..7dcdf211 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/dynamictexturedata.h
+++ b/tests/baseline/scenegrabber/dynamictexturedata.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/indextrianglestopology.cpp b/tests/baseline/scenegrabber/indextrianglestopology.cpp
index 9cbf9150..9cbf9150 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/indextrianglestopology.cpp
+++ b/tests/baseline/scenegrabber/indextrianglestopology.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/indextrianglestopology.h b/tests/baseline/scenegrabber/indextrianglestopology.h
index 5f2b8e53..5f2b8e53 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/indextrianglestopology.h
+++ b/tests/baseline/scenegrabber/indextrianglestopology.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/main.cpp b/tests/baseline/scenegrabber/main.cpp
index 7dca5f6d..7dca5f6d 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/main.cpp
+++ b/tests/baseline/scenegrabber/main.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/nonindextrianglestopology.cpp b/tests/baseline/scenegrabber/nonindextrianglestopology.cpp
index 3d4e1391..3d4e1391 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/nonindextrianglestopology.cpp
+++ b/tests/baseline/scenegrabber/nonindextrianglestopology.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/nonindextrianglestopology.h b/tests/baseline/scenegrabber/nonindextrianglestopology.h
index 3152e2e0..3152e2e0 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/nonindextrianglestopology.h
+++ b/tests/baseline/scenegrabber/nonindextrianglestopology.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/pointstopology.cpp b/tests/baseline/scenegrabber/pointstopology.cpp
index 6a038d43..6a038d43 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/pointstopology.cpp
+++ b/tests/baseline/scenegrabber/pointstopology.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/pointstopology.h b/tests/baseline/scenegrabber/pointstopology.h
index 3e4ebe86..3e4ebe86 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/pointstopology.h
+++ b/tests/baseline/scenegrabber/pointstopology.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/skingeometry.cpp b/tests/baseline/scenegrabber/skingeometry.cpp
index c8f72e0e..c8f72e0e 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/skingeometry.cpp
+++ b/tests/baseline/scenegrabber/skingeometry.cpp
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/skingeometry.h b/tests/baseline/scenegrabber/skingeometry.h
index a9310f5e..a9310f5e 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/skingeometry.h
+++ b/tests/baseline/scenegrabber/skingeometry.h
diff --git a/tests/auto/quick3d_lancelot/scenegrabber/trim.ttf b/tests/baseline/scenegrabber/trim.ttf
index 92f3d135..92f3d135 100644
--- a/tests/auto/quick3d_lancelot/scenegrabber/trim.ttf
+++ b/tests/baseline/scenegrabber/trim.ttf