Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp
index 2122d7eb5..a0278f4e4 100644
--- a/tests/auto/render/qmesh/tst_qmesh.cpp
+++ b/tests/auto/render/qmesh/tst_qmesh.cpp
@@ -121,7 +121,7 @@ private Q_SLOTS:
             const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QGeometryRendererData>>(creationChanges.first());
             const Qt3DRender::QGeometryRendererData cloneData = creationChangeData->data;
 
-            Qt3DRender::MeshFunctor meshFunctor(mesh.source(), mesh.meshName());
+            Qt3DRender::MeshLoaderFunctor meshFunctor(&mesh, nullptr);
 
             QVERIFY(meshFunctor == *cloneData.geometryFactory);
             QCOMPARE(mesh.id(), creationChangeData->subjectId());
@@ -169,7 +169,7 @@ private Q_SLOTS:
             QCOMPARE(change->propertyName(), "geometryFactory");
             QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
 
-            Qt3DRender::MeshFunctor meshFunctor(mesh.source());
+            Qt3DRender::MeshLoaderFunctor meshFunctor(&mesh, nullptr);
             Qt3DRender::QGeometryFactoryPtr factory = change->value().value<Qt3DRender::QGeometryFactoryPtr>();
             QVERIFY(meshFunctor == *factory);
 
@@ -205,7 +205,7 @@ private Q_SLOTS:
             QCOMPARE(change->propertyName(), "geometryFactory");
             QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
 
-            Qt3DRender::MeshFunctor meshFunctor(QUrl(), mesh.meshName());
+            Qt3DRender::MeshLoaderFunctor meshFunctor(&mesh, nullptr);
             Qt3DRender::QGeometryFactoryPtr factory = change->value().value<Qt3DRender::QGeometryFactoryPtr>();
             QVERIFY(meshFunctor == *factory);