Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl

Qt 6.2.10-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: Iddb8ace5a962a6547269ab6e6e8334b619b08d4a

381 files changed, 103 insertions, 2269 deletions

diff --git a/.cmake.conf b/.cmake.conf
index beccb22d..31a36e3b 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.9")
+set(QT_REPO_MODULE_VERSION "6.2.10")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index b90c6728..fd9d6e45 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 6.2.9
+MODULE_VERSION = 6.2.10
diff --git a/dependencies.yaml b/dependencies.yaml
index 64b2d0ac..0f452387 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -3,11 +3,11 @@ dependencies:
     ref: 017d80e12fa50c50fa6751a039d3a7c9e799f34c
     required: true
   ../tqtc-qtdeclarative:
-    ref: b078003a3c81f1438dcaf932371d564003c99395
+    ref: 9886ff37350f661aad5b8bfaf2776e8429f208a7
     required: true
   ../tqtc-qtquicktimeline:
-    ref: 2df2dd712e02869002db29d5f00293d05dc841e1
+    ref: 89954c6181818f677dfcff5add147625d6e2f1cb
     required: false
   ../tqtc-qtshadertools:
-    ref: 35662703a974d3929d1ea039c2534271cf60700f
+    ref: e6be6ff4be1820e5377d78efa388321de216b66f
     required: true
diff --git a/src/quick3d/doc/src/qtquick3d-2d.qdoc b/src/quick3d/doc/src/qtquick3d-2d.qdoc
index bbd4409a..11fda81e 100644
--- a/src/quick3d/doc/src/qtquick3d-2d.qdoc
+++ b/src/quick3d/doc/src/qtquick3d-2d.qdoc
@@ -221,8 +221,8 @@ clipping is essential to the design of 2D items, the application should make an
 fall back to rendering to a texture. This can be achieved by adding \c{layer.enabled:
 true} to the top-level \c Item under the 3D node.
 
-\li As of Qt 6.0, keyboard, mouse, and touch input is not passed to the 2D items, so they
-will be non-interactive.
+\li As of Qt 6.2, input is passed to the 2D items as necessary. Input from pointing devices
+must occur within the \l{Item::childrenRect.x}{childrenRect} of the declared Items.
 
 \li While adding a 2D item tree into the 3D scene is fairly cheap, excess amounts
 (hundreds or more) of 2D subtrees within the 3D scene should be avoided, because in large
@@ -233,6 +233,6 @@ subtree.
 
 \endlist
 
-\sa {Qt Quick 3D - Quick Items Example}
+\sa {Qt Quick 3D - Quick Items Example}, QQuickItem::mapFromGlobal()
 
 */
diff --git a/src/quick3d/doc/src/qtquick3d-qmlmodule.qdoc b/src/quick3d/doc/src/qtquick3d-qmlmodule.qdoc
index f31a0729..b3696728 100644
--- a/src/quick3d/doc/src/qtquick3d-qmlmodule.qdoc
+++ b/src/quick3d/doc/src/qtquick3d-qmlmodule.qdoc
@@ -34,15 +34,13 @@ This is the QML frontend for using the spatial renderer and scenegraph. For the
 time being, all 3D content goes through offscreen textures (FBO)s so that they
 can be composed into Qt Quick scenes (as a QQuickItem).
 
-Qt Quick 3D provides the following QML types:
-
-\section1 QtQuick3D QML Types
-
 Import the QtQuick3D module with the following statement:
 
-\code
+\qml
 import QtQuick3D
-\endcode
+\endqml
+
+\section1 QtQuick3D QML Types
 
 \generatelist qmltypesbymodule QtQuick3D
 
@@ -56,9 +54,9 @@ import QtQuick3D.Effects
 
 Import the QtQuick3D.Helpers module with the following statement:
 
-\code
+\qml
 import QtQuick3D.Helpers
-\endcode
+\endqml
 
 \generatelist qmltypesbymodule QtQuick3D.Helpers
 
@@ -66,9 +64,9 @@ import QtQuick3D.Helpers
 
 Import the QtQuick3D.AssetUtils module with the following statement:
 
-\code
+\qml
 import QtQuick3D.AssetUtils
-\endcode
+\endqml
 
 \generatelist qmltypesbymodule QtQuick3D.AssetUtils
 
@@ -76,9 +74,9 @@ import QtQuick3D.AssetUtils
 
 Import the QtQuick3D.Particles3D module with the following statement:
 
-\code
+\qml
 import QtQuick3D.Particles3D
-\endcode
+\endqml
 
 \generatelist qmltypesbymodule QtQuick3D.Particles3D
 
diff --git a/src/quick3d/qquick3dmodel.cpp b/src/quick3d/qquick3dmodel.cpp
index 646a5dff..b6b947ee 100644
--- a/src/quick3d/qquick3dmodel.cpp
+++ b/src/quick3d/qquick3dmodel.cpp
@@ -70,32 +70,40 @@ QT_BEGIN_NAMESPACE
 
     \section2 Custom geometry
 
-    In addition to using static meshes, it is possible to implement a \l {QQuick3DGeometry}{custom geometry} provider that
-    provides the model with custom vertex data at run-time. See the \l {Qt Quick 3D - Custom Geometry Example}{Custom Geometry Example}
-    for an example on how to create and use a custom material with your model.
+    In addition to using static meshes, you can implement a
+    \l {QQuick3DGeometry}{custom geometry} provider that provides the model with
+    custom vertex data at run-time. See the
+    \l {Qt Quick 3D - Custom Geometry Example}{Custom Geometry Example} for an
+    example on how to create and use a custom material with your model.
 
     \section1 Materials
 
-    A model can consist of several sub-meshes, each of which can have its own material.
-    The sub-mesh uses a material from the \l{materials} list, corresponding to its index.
-    If the number of materials is less than the sub-meshes, the last material in the list is used
-    for subsequent sub-meshes. This is demonstrated in the \l {Qt Quick 3D - Sub-mesh Example}{Sub-mesh example}.
+    A model can consist of several sub-meshes, each of which can have its own
+    material. The sub-mesh uses a material from the \l{materials} list,
+    corresponding to its index. If the number of materials is less than the
+    sub-meshes, the last material in the list is used for subsequent sub-meshes.
+    This is demonstrated in the
+    \l {Qt Quick 3D - Sub-mesh Example}{Sub-mesh example}.
 
-    There are currently three different materials that can be used with the model item,
-    the \l {PrincipledMaterial}, the \l {DefaultMaterial}, and the \l {CustomMaterial}.
+    You can use the following materials with the model item:
+    \l {PrincipledMaterial}, \l {DefaultMaterial}, and \l {CustomMaterial}.
 
     \section1 Picking
 
-    Picking is the process of sending a ray through the scene from some starting position to find which model(s) intersects
-    with the ray. In QtQuick3D the ray is normally sent from the view using 2D coordinates resulting from a touch or mouse
-    event. If a model was hit by the ray a \l {PickResult} will be returned with a handle to the model and information about
-    where the ray hit the model. For models that use \l {QQuick3DGeometry}{custom geometry} the picking is less accurate then
-    for static mesh data, as picking is only done against the models \l {Bounds}{bounding volume}.
-    If the ray goes through more then one model, the closest \l {Model::pickable}{pickable} model is selected.
-
-    Note that models are not \l {Model::pickable}{pickable} by default, so to be able to \l {View3D::pick}{pick} a model
-    in the scene, the model will need to make it self discoverable by setting the \l {Model::pickable}{pickable} property to true.
-    Visit the \l {Qt Quick 3D - Picking example} to see how picking can be enabled.
+    \e Picking is the process of sending a ray through the scene from some
+    starting position to find which models intersect with the ray. In
+    Qt Quick 3D, the ray is normally sent from the view using 2D coordinates
+    resulting from a touch or mouse event. If a model was hit by the ray,
+    \l {PickResult} will be returned with a handle to the model and information
+    about where the ray hit the model. For models that use
+    \l {QQuick3DGeometry}{custom geometry}, the picking is less accurate than
+    for static mesh data, as picking is only done against the model's
+    \l {Bounds}{bounding volume}. If the ray goes through more than one model,
+    the closest \l {Model::pickable}{pickable} model is selected.
+
+    Note that for models to be \l {Model::pickable}{pickable}, their
+    \l {Model::pickable}{pickable} property must be set to \c true. For more
+    information, see \l {Qt Quick 3D - Picking example}.
 
 */
 
diff --git a/src/quick3d/qquick3dsceneenvironment.cpp b/src/quick3d/qquick3dsceneenvironment.cpp
index ea0c406c..bfcc1f28 100644
--- a/src/quick3d/qquick3dsceneenvironment.cpp
+++ b/src/quick3d/qquick3dsceneenvironment.cpp
@@ -241,7 +241,8 @@ float QQuick3DSceneEnvironment::aoDistance() const
 /*!
     \qmlproperty float QtQuick3D::SceneEnvironment::aoSoftness
 
-    This property how smooth the edges of the ambient occlusion shading are.
+    This property defines how smooth the edges of the ambient occlusion shading
+    are.
 
     The value must be between 0.0 and 50.0. The default value is 50.0.
 */
diff --git a/src/runtimerender/qssgrhicontext.cpp b/src/runtimerender/qssgrhicontext.cpp
index 0b342bdf..d6ace7f8 100644
--- a/src/runtimerender/qssgrhicontext.cpp
+++ b/src/runtimerender/qssgrhicontext.cpp
@@ -921,7 +921,7 @@ QSSGRhiContext::QSSGRhiContext()
 QSSGRhiContext::~QSSGRhiContext()
 {
     for (QSSGRhiDrawCallData &dcd : m_drawCallData)
-        dcd.reset();
+        releaseDrawCallData(dcd);
 
     qDeleteAll(m_pipelines);
     qDeleteAll(m_computePipelines);
@@ -962,6 +962,17 @@ QRhiShaderResourceBindings *QSSGRhiContext::srb(const QSSGRhiShaderResourceBindi
     return srb;
 }
 
+void QSSGRhiContext::releaseDrawCallData(QSSGRhiDrawCallData &dcd)
+{
+    delete dcd.ubuf;
+    dcd.ubuf = nullptr;
+    auto srb = m_srbCache.take(dcd.bindings);
+    Q_ASSERT(srb == dcd.srb);
+    delete srb;
+    dcd.srb = nullptr;
+    dcd.pipeline = nullptr;
+}
+
 QRhiGraphicsPipeline *QSSGRhiContext::pipeline(const QSSGGraphicsPipelineStateKey &key,
                                                QRhiRenderPassDescriptor *rpDesc,
                                                QRhiShaderResourceBindings *srb)
@@ -1071,7 +1082,7 @@ void QSSGRhiContext::cleanupDrawCallData(const QSSGRenderModel *model)
     auto it = m_drawCallData.begin();
     while (it != m_drawCallData.end()) {
         if (it.key().model == modelNode) {
-            it.value().reset();
+            releaseDrawCallData(*it);
             it = m_drawCallData.erase(it);
         } else {
             ++it;
diff --git a/src/runtimerender/qssgrhicontext_p.h b/src/runtimerender/qssgrhicontext_p.h
index 6767c45c..02d5ffeb 100644
--- a/src/runtimerender/qssgrhicontext_p.h
+++ b/src/runtimerender/qssgrhicontext_p.h
@@ -703,13 +703,6 @@ struct QSSGRhiDrawCallData
     size_t renderTargetDescriptionHash = 0;
     QVector<quint32> renderTargetDescription;
     QSSGRhiGraphicsPipelineState ps;
-
-    void reset() {
-        delete ubuf;
-        ubuf = nullptr;
-        srb = nullptr;
-        pipeline = nullptr;
-    }
 };
 
 struct QSSGRhiSortData
@@ -916,6 +909,7 @@ public:
     }
 
     QRhiShaderResourceBindings *srb(const QSSGRhiShaderResourceBindingList &bindings);
+    void releaseDrawCallData(QSSGRhiDrawCallData &dcd);
     QRhiGraphicsPipeline *pipeline(const QSSGGraphicsPipelineStateKey &key,
                                    QRhiRenderPassDescriptor *rpDesc,
                                    QRhiShaderResourceBindings *srb);
diff --git a/tests/auto/quick3d_lancelot/CMakeLists.txt b/tests/auto/quick3d_lancelot/CMakeLists.txt
deleted file mode 100644
index 60508497..00000000
--- a/tests/auto/quick3d_lancelot/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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 6bad2ba4..00000000
--- a/tests/auto/quick3d_lancelot/hostinfo.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the QtQml module of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# 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 2045187b..00000000
--- a/tests/auto/quick3d_lancelot/shared/baselineprotocol.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#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 2be91308..00000000
--- a/tests/auto/quick3d_lancelot/shared/baselineprotocol.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#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 1fbe6b49..00000000
--- a/tests/auto/quick3d_lancelot/shared/lookup3.cpp
+++ /dev/null
@@ -1,846 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-/*
-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.  [email protected].  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 bfb57ded..00000000
--- a/tests/auto/quick3d_lancelot/shared/qbaselinetest.cpp
+++ /dev/null
@@ -1,431 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#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 392d66cf..00000000
--- a/tests/auto/quick3d_lancelot/shared/qbaselinetest.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#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 45e0ddad..45e0ddad 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 3e1c9102..3e1c9102 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 bda18fa2..bda18fa2 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 c079e989..c079e989 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 fcb00ad4..fcb00ad4 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 d4ac25fc..d4ac25fc 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 3fa9032d..3fa9032d 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 6067d2a6..6067d2a6 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/customgeometry/dynamicgeometry.qml b/tests/baseline/data/customgeometry/dynamicgeometry.qml
index 88525523..88525523 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 ba03c7ec..ba03c7ec 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 5a6c86ef..5a6c86ef 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 bc9d8615..bc9d8615 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/custom_depthDrawModes.qml b/tests/baseline/data/custommaterial/custom_depthDrawModes.qml
index 925af562..925af562 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 3c009799..3c009799 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 55f24197..55f24197 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 be370018..be370018 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 1f3a1efb..1f3a1efb 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 5cb3c315..5cb3c315 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 c70ecda6..c70ecda6 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 21c9a3a6..21c9a3a6 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 552064f5..552064f5 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 c5135a86..c5135a86 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 2b78e31d..2b78e31d 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_keywords.qml b/tests/baseline/data/custommaterial/custommaterial_keywords.qml
index 20837d23..20837d23 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 9b17ed00..9b17ed00 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 4a3168d5..4a3168d5 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 730d6125..730d6125 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 cedff388..cedff388 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 3a4ed580..3a4ed580 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 79d935eb..79d935eb 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 3097124d..3097124d 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 f77e6461..f77e6461 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 1e3114b9..1e3114b9 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 3029604f..3029604f 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 eb42cdfb..eb42cdfb 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 aeb60dd9..aeb60dd9 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 51fc88ed..51fc88ed 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 e708a2ea..e708a2ea 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 ca9d7de8..ca9d7de8 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 91c16c58..91c16c58 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 ffd10571..ffd10571 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 ac956d13..ac956d13 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 f4cf2c2a..f4cf2c2a 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 1a8ca0e3..1a8ca0e3 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/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 63eff9f0..63eff9f0 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 dd51f3d2..dd51f3d2 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 ebcfdf66..ebcfdf66 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 8a9f6dcf..8a9f6dcf 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 199ba133..199ba133 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 1851fbd7..1851fbd7 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 6c965151..6c965151 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 1fbda881..1fbda881 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 7ada36df..7ada36df 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 f57a749f..f57a749f 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 8319804b..8319804b 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 ba5ce2dd..ba5ce2dd 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 25055966..25055966 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 3ce9fcc4..3ce9fcc4 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 50f51db6..50f51db6 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 4c36fc9e..4c36fc9e 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 338c5bcf..338c5bcf 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 86d66302..86d66302 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 70d53c8a..70d53c8a 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 8e9e000d..8e9e000d 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/depth.qml b/tests/baseline/data/effects/depth.qml
index 9e7132b4..9e7132b4 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 20119251..20119251 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 4cbd3f51..4cbd3f51 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 3c78264e..3c78264e 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 391a8e43..391a8e43 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/misc.qml b/tests/baseline/data/effects/misc.qml
index 3494e17e..3494e17e 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 48c5e663..48c5e663 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 d59df1cd..d59df1cd 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 49f0fd1d..49f0fd1d 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 d368fca1..d368fca1 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 e76e20c4..e76e20c4 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 ab937b8f..ab937b8f 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/instancing/Primitives.qml b/tests/baseline/data/instancing/Primitives.qml
index b4773b52..b4773b52 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 f23f1a2c..f23f1a2c 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 13975891..13975891 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 35cd4afa..35cd4afa 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 9697a38d..9697a38d 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 d0236bf2..d0236bf2 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/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 c383815a..c383815a 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 8d416c15..8d416c15 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 39ef7333..39ef7333 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 ed08d533..ed08d533 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 08a3b9bc..08a3b9bc 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/Geometry_1.qml b/tests/baseline/data/layers/Geometry_1.qml
index 39795935..39795935 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 6f7a4df2..6f7a4df2 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 893966df..893966df 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 e1877a12..e1877a12 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 e69ae408..e69ae408 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 f0593c53..f0593c53 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 d51b6e22..d51b6e22 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 cfd92917..cfd92917 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/Multisample_aa_2x.qml b/tests/baseline/data/layers/Multisample_aa_2x.qml
index 2f1f477f..2f1f477f 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 2a5cdd1b..2a5cdd1b 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 0bb4c883..0bb4c883 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/Ssaa.qml b/tests/baseline/data/layers/Ssaa.qml
index 2f6f77d1..2f6f77d1 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 13ce5136..13ce5136 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/Tonemapping_aces.qml b/tests/baseline/data/layers/Tonemapping_aces.qml
index 4c6b68c1..4c6b68c1 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_filmic.qml b/tests/baseline/data/layers/Tonemapping_filmic.qml
index fcfe25e5..fcfe25e5 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 28b3f55d..28b3f55d 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 6a1e5138..6a1e5138 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 039b697e..039b697e 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/Imagebasedlighting.qml b/tests/baseline/data/lighting/Imagebasedlighting.qml
index 185b191f..185b191f 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 5bcff8cd..5bcff8cd 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/ScopedLights.qml b/tests/baseline/data/lighting/ScopedLights.qml
index fceee5a1..fceee5a1 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 809dd70f..809dd70f 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_with_compressed.qml b/tests/baseline/data/lighting/SkyboxIBL_with_compressed.qml
index 3e44cbe2..3e44cbe2 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 9c1c914c..9c1c914c 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 c9b418a8..c9b418a8 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/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/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 142f42c8..142f42c8 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 f762f5d4..f762f5d4 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 3feb50ff..3feb50ff 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/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 768c66c2..768c66c2 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 58fb5e05..58fb5e05 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 170de821..170de821 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 a59d12d8..a59d12d8 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 d62dbcac..d62dbcac 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 ca3b8a70..ca3b8a70 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/NodeHierarchy.qml b/tests/baseline/data/particles3d/NodeHierarchy.qml
index a812bde8..a812bde8 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/SpriteColorTable.qml b/tests/baseline/data/particles3d/SpriteColorTable.qml
index f7418365..f7418365 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/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/principled/alpha.qml b/tests/baseline/data/principled/alpha.qml
index 59e844b6..59e844b6 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 b1e59945..b1e59945 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 007fc238..007fc238 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 eaeba25f..eaeba25f 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 622ad3e9..622ad3e9 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/basecolor.qml b/tests/baseline/data/principled/basecolor.qml
index 447e3505..447e3505 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/depthDrawModes.qml b/tests/baseline/data/principled/depthDrawModes.qml
index d9f1c9de..d9f1c9de 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 05129144..05129144 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 2496088e..2496088e 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 a1f2a9c0..a1f2a9c0 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 78ac133e..78ac133e 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 d18706a7..d18706a7 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 aa2cc8b9..aa2cc8b9 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 0d73dd7b..0d73dd7b 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 6384c67d..6384c67d 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 033ed919..033ed919 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/metalness.qml b/tests/baseline/data/principled/metalness.qml
index 321b45bd..321b45bd 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 c1c15467..c1c15467 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 cfec111c..cfec111c 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 221c1dcb..221c1dcb 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 a7be95b3..a7be95b3 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 53b05470..53b05470 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 bb24a3d3..bb24a3d3 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 d5c4b141..d5c4b141 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 dd1b19da..dd1b19da 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 2d1ae735..2d1ae735 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 645f0866..645f0866 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 86223a4a..86223a4a 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 711297ee..711297ee 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 c59ece9c..c59ece9c 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 04e0ac63..04e0ac63 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 f34af9ec..f34af9ec 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/qml/QmlstreamAnimated.qml b/tests/baseline/data/qml/QmlstreamAnimated.qml
index 6b5615af..6b5615af 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 5fc9e955..5fc9e955 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 86fbc81b..86fbc81b 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 dcf95fe7..dcf95fe7 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 33a8b3f5..33a8b3f5 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 90ffa7c9..90ffa7c9 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 0be7080d..0be7080d 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 72870c27..72870c27 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 8648a902..8648a902 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/RenderingOrder.qml b/tests/baseline/data/quick/RenderingOrder.qml
index 1755c013..1755c013 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 15f57c07..15f57c07 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/shadows/CastReceiveShadow.qml b/tests/baseline/data/shadows/CastReceiveShadow.qml
index c8b1dbf3..c8b1dbf3 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 e3ff947b..e3ff947b 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/Pointlight.qml b/tests/baseline/data/shadows/Pointlight.qml
index f7b84724..f7b84724 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 6ba54fa8..6ba54fa8 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 0cf6070e..0cf6070e 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 0b41b03c..0b41b03c 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 68f9faef..68f9faef 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 365d5979..365d5979 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/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/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/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/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/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/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/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/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/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/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 fcd7ff85..fcd7ff85 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/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 e1d1ab53..e1d1ab53 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_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 91fd64d5..91fd64d5 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/submeshes/onetomany.qml b/tests/baseline/data/submeshes/onetomany.qml
index 30c5642e..30c5642e 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 6b9bbb2e..6b9bbb2e 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 e058cf4d..e058cf4d 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 03767cd6..03767cd6 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 539d3ea2..539d3ea2 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 90dee793..90dee793 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 74db3f5e..74db3f5e 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 9f80e6b0..9f80e6b0 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 5726a376..5726a376 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 e921724e..e921724e 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 e91efd5d..e91efd5d 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 da8a8b5b..da8a8b5b 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 01eacef9..01eacef9 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 cc8f932d..cc8f932d 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 e2c29700..e2c29700 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 104ffe30..104ffe30 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 2f1000db..2f1000db 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 bfbe0a5c..bfbe0a5c 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/ClearModeColor.qml b/tests/baseline/data/view3d/ClearModeColor.qml
index edb8a2ec..edb8a2ec 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 2b23fc10..2b23fc10 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/ClearModeTransparent.qml b/tests/baseline/data/view3d/ClearModeTransparent.qml
index cd313e81..cd313e81 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 70fd69f3..70fd69f3 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 b3b20a27..b3b20a27 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/NoSize.qml b/tests/baseline/data/view3d/NoSize.qml
index ddf6df28..ddf6df28 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 cb1e6951..cb1e6951 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 c9251d1d..c9251d1d 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 8a124bf2..8a124bf2 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/RenderModeRenderNode.qml b/tests/baseline/data/view3d/RenderModeRenderNode.qml
index 61669584..61669584 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/RenderModeRenderNode.qml
+++ b/tests/baseline/data/view3d/RenderModeRenderNode.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeTexture.qml b/tests/baseline/data/view3d/RenderModeTexture.qml
index 693dcb03..693dcb03 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 9dbb53c9..9dbb53c9 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 4a16bf21..4a16bf21 100644
--- a/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml
+++ b/tests/baseline/data/view3d/SceneComponent.qml
diff --git a/tests/auto/quick3d_lancelot/quick3d/CMakeLists.txt b/tests/baseline/quick3d/CMakeLists.txt
index 9a23d292..215b5ca2 100644
--- a/tests/auto/quick3d_lancelot/quick3d/CMakeLists.txt
+++ b/tests/baseline/quick3d/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from quick3d.pro.
 
 #####################################################################
@@ -6,27 +9,30 @@
 
 # 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=\\\"\\\"
+        QMAKESPEC=""
     INCLUDE_DIRECTORIES
-        ../shared
-    PUBLIC_LIBRARIES
+        ${BASELINE_DIR}
+    LIBRARIES
         Qt::Gui
         Qt::Network
     TESTDATA ${test_data}
 )
 
 # 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 2ec7a51c..6aac9cc2 100644
--- a/tests/auto/quick3d_lancelot/quick3d/tst_quick3d.cpp
+++ b/tests/baseline/quick3d/tst_baseline_quick3d.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// 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>
 
@@ -151,7 +126,7 @@ void tst_Quick3D::setupTestSuite(const QByteArray& filter)
     }
 
     std::sort(itemFiles.begin(), itemFiles.end());
-    for (const QString &filePath : qAsConst(itemFiles)) {
+    for (const QString &filePath : std::as_const(itemFiles)) {
         QByteArray itemName = filePath.mid(testSuitePath.length() + 1).toLatin1();
         QBaselineTest::newRow(itemName, checksumFileOrDir(filePath)) << filePath;
         numItems++;
@@ -265,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 890fba09..890fba09 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 ff3fad72..ff3fad72 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 0631d909..0631d909 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 099b9028..099b9028 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 1d94981f..1d94981f 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 c9fdfc65..c9fdfc65 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 492b5154..492b5154 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 1844abea..1844abea 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 d05bc862..d05bc862 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 371ad787..371ad787 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 cdc13ad5..cdc13ad5 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 56aafead..56aafead 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 f9ec1d71..f9ec1d71 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 b9bf7c1a..b9bf7c1a 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