diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-10-21 17:01:18 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-10-22 21:29:58 +0100 |
| commit | 84766ed9098f10efc53e4e43a75eef38fce7fbf6 (patch) | |
| tree | d95332be5a1b3ba77be439833f7bc18469ccce78 /tests | |
| parent | 257c9bc8b53fb62fcad6bb8977b048d3a7563469 (diff) | |
Fix post FF API changes
Change-Id: I347f6df41c0a4f2295831e78248669b4a2d6b5ef
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/common/testpostmanarbiter.h | 1 | ||||
| -rw-r--r-- | tests/auto/core/nodes/tst_nodes.cpp | 12 | ||||
| -rw-r--r-- | tests/auto/render/raycastingjob/tst_raycastingjob.cpp | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h index cecc24f93..6649c7bbe 100644 --- a/tests/auto/core/common/testpostmanarbiter.h +++ b/tests/auto/core/common/testpostmanarbiter.h @@ -28,6 +28,7 @@ #include <Qt3DCore/private/qpostman_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> +#include <Qt3DCore/private/qscenechange_p.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 3b93e7715..25565d470 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -40,6 +40,7 @@ #include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> #include <Qt3DCore/private/qaspectengine_p.h> +#include <Qt3DCore/private/qscenechange_p.h> #include <private/qabstractaspect_p.h> #include <private/qpostman_p.h> @@ -516,7 +517,7 @@ public: void syncDirtyFrontEndNode(Qt3DCore::QNode *node, Qt3DCore::QBackendNode *backend, bool firstTime) const override { - Q_UNUSED(backend); + Q_UNUSED(backend) auto q = q_func(); if (firstTime) q->allNodes.insert(node->id(), node); @@ -527,10 +528,11 @@ public: TestAspect::TestAspect(QObject *parent) : TestAspect(*new TestAspectPrivate, parent) { - registerBackendType<Qt3DCore::QEntity, true>(QSharedPointer<TestFunctor>::create(this)); - registerBackendType<MyQEntity, true>(QSharedPointer<TestFunctor>::create(this)); - registerBackendType<MyQNode, true>(QSharedPointer<TestFunctor>::create(this)); - registerBackendType<Qt3DCore::QNode, true>(QSharedPointer<TestFunctor>::create(this)); + Q_D(TestAspect); + d->registerBackendType<Qt3DCore::QEntity, true>(QSharedPointer<TestFunctor>::create(this)); + d->registerBackendType<MyQEntity, true>(QSharedPointer<TestFunctor>::create(this)); + d->registerBackendType<MyQNode, true>(QSharedPointer<TestFunctor>::create(this)); + d->registerBackendType<Qt3DCore::QNode, true>(QSharedPointer<TestFunctor>::create(this)); } TestAspect::TestAspect(TestAspectPrivate &dd, QObject *parent) diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index 1ff899936..eaf85f5b6 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -285,7 +285,7 @@ private Q_SLOTS: initializeJob(&rayCastingJob, test.data()); bool earlyReturn = !rayCastingJob.runHelper(); - rayCastingJob.postFrame(test->aspectManager()); + Qt3DCore::QAspectJobPrivate::get(&rayCastingJob)->postFrame(test->aspectManager()); QCoreApplication::processEvents(); // THEN @@ -345,7 +345,7 @@ private Q_SLOTS: initializeJob(&rayCastingJob, test.data()); bool earlyReturn = !rayCastingJob.runHelper(); - rayCastingJob.postFrame(test->aspectManager()); + Qt3DCore::QAspectJobPrivate::get(&rayCastingJob)->postFrame(test->aspectManager()); QCoreApplication::processEvents(); // THEN |