Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/auto/render/sceneloader/tst_sceneloader.cpp b/tests/auto/render/sceneloader/tst_sceneloader.cpp
index edd6fabda..975c2c892 100644
--- a/tests/auto/render/sceneloader/tst_sceneloader.cpp
+++ b/tests/auto/render/sceneloader/tst_sceneloader.cpp
@@ -79,7 +79,7 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DRender::QSceneLoader frontendSceneLoader;
-        frontendSceneLoader.setSource(QUrl(QStringLiteral("CorvetteMuseum")));
+        frontendSceneLoader.setSource(QUrl(QStringLiteral("file:///CorvetteMuseum")));
 
         Qt3DRender::Render::Scene sceneLoader;
         Qt3DRender::Render::SceneManager sceneManager;
@@ -109,7 +109,7 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-        const QUrl newUrl(QStringLiteral("Bownling_Green_KY"));
+        const QUrl newUrl(QStringLiteral("file:///Bownling_Green_KY"));
         updateChange->setValue(newUrl);
         updateChange->setPropertyName("source");
         sceneLoader.sceneChangeEvent(updateChange);
@@ -147,7 +147,6 @@ private Q_SLOTS:
         QCOMPARE(arbiter.events.count(), 1);
         QCOMPARE(change->propertyName(), "scene");
         QCOMPARE(change->value().value<Qt3DCore::QEntity *>(), &subtree);
-        QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true);
 
         arbiter.events.clear();
     }
@@ -170,7 +169,6 @@ private Q_SLOTS:
         QCOMPARE(arbiter.events.count(), 1);
         QCOMPARE(change->propertyName(), "status");
         QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Ready);
-        QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true);
 
         arbiter.events.clear();
     }