Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
index 6aef510ea..bf5f0d55f 100644
--- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
+++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
@@ -46,7 +46,7 @@ public:
 
     bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
     {
-        return functor_cast<MeshFunctorA>(&other);
+        return Qt3DRender::functor_cast<MeshFunctorA>(&other);
     }
 
     QT3D_FUNCTOR(MeshFunctorA)
@@ -68,7 +68,7 @@ public:
 
     bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
     {
-        return functor_cast<MeshFunctorB>(&other);
+        return Qt3DRender::functor_cast<MeshFunctorB>(&other);
     }
 
     QT3D_FUNCTOR(MeshFunctorB)
@@ -85,7 +85,7 @@ public:
 
     bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
     {
-        return functor_cast<MeshFunctorASub>(&other);
+        return Qt3DRender::functor_cast<MeshFunctorASub>(&other);
     }
 
     QT3D_FUNCTOR(MeshFunctorASub)