diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp')
-rw-r--r-- | tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 7cf70c03c..70fe957c5 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -51,7 +51,7 @@ public: bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_FINAL { - const TestFactory *otherFactory = functor_cast<TestFactory>(&other); + const TestFactory *otherFactory = Qt3DRender::functor_cast<TestFactory>(&other); if (otherFactory != nullptr) return otherFactory->m_size == m_size; return false; |