diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-12-02 19:49:40 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-12-03 09:07:36 +0000 |
| commit | 568b2d62e6e07b40d602bcd2a1c2e8e566c41b9f (patch) | |
| tree | 9cadf41046830668d77884b8d4f80803d1152ae9 /tests/auto/core | |
| parent | ac70d64a037e58a1e8c0fdebc83809f50948f742 (diff) | |
Revert "Fix post FF API changes"
84766ed9098f10efc53e4e43a75eef38fce7fbf6
Change-Id: I12341ec1b7bc68a7586c6671aa7b8f21caed17e0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/core')
| -rw-r--r-- | tests/auto/core/common/testpostmanarbiter.h | 1 | ||||
| -rw-r--r-- | tests/auto/core/nodes/tst_nodes.cpp | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h index 6649c7bbe..cecc24f93 100644 --- a/tests/auto/core/common/testpostmanarbiter.h +++ b/tests/auto/core/common/testpostmanarbiter.h @@ -28,7 +28,6 @@ #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 b5291cab7..87f66bab2 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -40,7 +40,6 @@ #include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> #include <Qt3DCore/private/qaspectengine_p.h> -#include <Qt3DCore/private/qscenechange_p.h> #include <Qt3DCore/private/qaspectengine_p.h> #include <private/qabstractaspect_p.h> #include <private/qpostman_p.h> @@ -531,7 +530,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); @@ -542,11 +541,10 @@ public: TestAspect::TestAspect(QObject *parent) : TestAspect(*new TestAspectPrivate, parent) { - 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)); + 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)); } TestAspect::TestAspect(TestAspectPrivate &dd, QObject *parent) |