diff options
24 files changed, 64 insertions, 151 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index aae2100c0..a816ec43a 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -40,7 +40,7 @@ #include <private/qabstractaspect_p.h> #include <Qt3DCore/private/qaspectjobmanager_p.h> #include <private/qchangearbiter_p.h> -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 87c9432d0..a9fdd7b2b 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -45,9 +45,10 @@ #include <Qt3DCore/private/corelogging_p.h> #include <QMetaObject> #include <private/qpostman_p.h> -#include "qscene.h" +#include <private/qscene_p.h> #include <private/qaspectengine_p.h> #include <private/qnode_p.h> +#include <private/qscene_p.h> #include "qentity.h" #include "qcomponent.h" #include "qnodevisitor.h" @@ -68,7 +69,7 @@ QAspectEnginePrivate::QAspectEnginePrivate() qRegisterMetaType<Qt3D::QAbstractAspect *>(); qRegisterMetaType<Qt3D::QObserverInterface *>(); qRegisterMetaType<Qt3D::QEntity *>(); - qRegisterMetaType<Qt3D::QSceneInterface *>(); + qRegisterMetaType<Qt3D::QScene *>(); } /*! @@ -145,7 +146,7 @@ void QAspectEngine::initialize() Q_ARG(Qt3D::QObserverInterface *, d->m_postman)); QMetaObject::invokeMethod(arbiter, "setScene", - Q_ARG(Qt3D::QSceneInterface *, d->m_scene)); + Q_ARG(Qt3D::QScene *, d->m_scene)); } void QAspectEngine::shutdown() diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index 4cafaf6a7..29270f516 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -50,7 +50,7 @@ class QNode; class QAspectEngine; class QAspectThread; class QPostman; -class QSceneInterface; +class QScene; class QAspectEnginePrivate : public QObjectPrivate { @@ -62,7 +62,7 @@ public: QAspectFactory m_factory; QAspectThread *m_aspectThread; QPostman *m_postman; - QSceneInterface *m_scene; + QScene *m_scene; QSharedPointer<QEntity> m_root; QList<QAbstractAspect*> m_aspects; diff --git a/src/core/core.pri b/src/core/core.pri index fc533627a..4eb8f09ff 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -30,8 +30,6 @@ HEADERS += \ $$PWD/qscenepropertychange_p.h \ $$PWD/qsceneobserverinterface.h \ $$PWD/qpostman_p.h \ - $$PWD/qscene.h \ - $$PWD/qsceneinterface.h \ $$PWD/qbackendscenepropertychange.h \ $$PWD/qbackendscenepropertychange_p.h \ $$PWD/qobservableinterface_p.h \ @@ -40,7 +38,8 @@ HEADERS += \ $$PWD/qchangearbiter_p.h \ $$PWD/qbackendnodefactory.h \ $$PWD/qray3d.h \ - $$PWD/qt3dcore_global_p.h + $$PWD/qt3dcore_global_p.h \ + $$PWD/qscene_p.h SOURCES += \ $$PWD/qtickclock.cpp \ diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index f9887e745..cb6c78dd4 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -38,7 +38,7 @@ #include "qcomponent_p.h" #include "qentity.h" #include "qentity_p.h" -#include "qsceneinterface.h" +#include "qscene_p.h" #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 8f9df993e..9c21f8dff 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -41,7 +41,7 @@ #include "qabstracttransform.h" #include "qmatrixtransform.h" -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/corelogging_p.h> #include <QMetaObject> diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 0636b48a2..11567ef1c 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -40,7 +40,7 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qaspectengine.h> -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> #include <QEvent> #include <QChildEvent> #include <QMetaObject> @@ -283,7 +283,7 @@ void QNode::sceneChangeEvent(const QSceneChangePtr &change) /*! \internal */ -void QNodePrivate::setScene(QSceneInterface *scene) +void QNodePrivate::setScene(QScene *scene) { if (m_scene != scene) m_scene = scene; @@ -292,7 +292,7 @@ void QNodePrivate::setScene(QSceneInterface *scene) /*! \internal */ -QSceneInterface *QNodePrivate::scene() const +QScene *QNodePrivate::scene() const { return m_scene; } @@ -582,15 +582,6 @@ QNode *QNode::clone(QNode *node) } /*! - Returns a pointer to the Qt3D::QNode instance's scene. -*/ -QSceneInterface *QNode::scene() const -{ - Q_D(const QNode); - return d->m_scene; -} - -/*! * This methods can only be called once and takes care of notyfing the backend * aspects that the current Qt3D::QNode instance is about to be destroyed. * diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 040942d81..c44c929d8 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -52,7 +52,6 @@ class QNode; class QNodePrivate; class QEntity; class QAspectEngine; -class QSceneInterface; typedef QList<QNode *> QNodeList; typedef QSharedPointer<QNode> QNodePtr; @@ -93,7 +92,6 @@ protected: QNode(QNodePrivate &dd, QNode *parent = 0); virtual void copy(const QNode *ref); virtual void sceneChangeEvent(const QSceneChangePtr &change); - QSceneInterface *scene() const; void cleanup(); diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 11f64be9c..2e3bce219 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -56,8 +56,8 @@ class QT3DCORESHARED_EXPORT QNodePrivate : public QObjectPrivate, public QObserv public: QNodePrivate(); - void setScene(QSceneInterface *scene); - QSceneInterface *scene() const; + void setScene(QScene *scene); + QScene *scene() const; void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE; @@ -71,7 +71,7 @@ public: // For now this just protects access to the m_changeArbiter. // Later on we may decide to extend support for multiple observers. QLockableObserverInterface *m_changeArbiter; - QSceneInterface *m_scene; + QScene *m_scene; mutable QNodeId m_id; bool m_blockNotifications; bool m_wasCleanedUp; diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 6d84eebfd..2bd807803 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -39,7 +39,7 @@ #include "qabstractaspectjobmanager_p.h" #include "qsceneobserverinterface.h" -#include "qsceneinterface.h" +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/corelogging_p.h> #include <QMutexLocker> #include <QReadLocker> @@ -193,7 +193,7 @@ void QChangeArbiter::syncChanges() distributeQueueChanges(changeQueue); } -void QChangeArbiter::setScene(QSceneInterface *scene) +void QChangeArbiter::setScene(QScene *scene) { m_scene = scene; } @@ -203,7 +203,7 @@ QObserverInterface *QChangeArbiter::postman() const return m_postman; } -QSceneInterface *QChangeArbiter::scene() const +QScene *QChangeArbiter::scene() const { return m_scene; } diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index a2046caab..33b23e0b0 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -58,7 +58,7 @@ class QObservableInterface; class QAbstractAspectJobManager; class QSceneObserverInterface; class QPostman; -class QSceneInterface; +class QScene; class QT3DCORESHARED_EXPORT QChangeArbiter : public QObject @@ -87,10 +87,10 @@ public: void sceneChangeEventWithLock(const QSceneChangeList &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl Q_INVOKABLE void setPostman(Qt3D::QObserverInterface *postman); - Q_INVOKABLE void setScene(Qt3D::QSceneInterface *scene); + Q_INVOKABLE void setScene(Qt3D::QScene *scene); QObserverInterface *postman() const; - QSceneInterface *scene() const; + QScene *scene() const; static void createUnmanagedThreadLocalChangeQueue(void *changeArbiter); static void destroyUnmanagedThreadLocalChangeQueue(void *changeArbiter); @@ -134,7 +134,7 @@ private: QList<QChangeQueue *> m_changeQueues; QList<QChangeQueue *> m_lockingChangeQueues; QObserverInterface *m_postman; - QSceneInterface *m_scene; + QScene *m_scene; }; } // namespace Qt3D diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp index d9a8738f7..bd91def10 100644 --- a/src/core/qpostman.cpp +++ b/src/core/qpostman.cpp @@ -38,7 +38,7 @@ #include <private/qobject_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DCore/qscene.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qnode.h> #include <Qt3DCore/private/qnode_p.h> @@ -56,7 +56,7 @@ public: } Q_DECLARE_PUBLIC(QPostman) - QSceneInterface *m_scene; + QScene *m_scene; }; QPostman::QPostman(QObject *parent) @@ -65,7 +65,7 @@ QPostman::QPostman(QObject *parent) qRegisterMetaType<QSceneChangePtr >("QSceneChangePtr"); } -void QPostman::setScene(QSceneInterface *scene) +void QPostman::setScene(QScene *scene) { Q_D(QPostman); d->m_scene = scene; diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h index 9132704c2..0e33fd371 100644 --- a/src/core/qpostman_p.h +++ b/src/core/qpostman_p.h @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QSceneInterface; +class QScene; class QPostmanPrivate; class QPostman @@ -54,7 +54,7 @@ class QPostman public: explicit QPostman(QObject *parent = 0); - void setScene(QSceneInterface *sceneLookup); + void setScene(QScene *sceneLookup); void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; private: diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp index cf3329b25..37c84d36d 100644 --- a/src/core/qscene.cpp +++ b/src/core/qscene.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qscene.h" +#include "qscene_p.h" #include <QHash> #include <QReadLocker> #include <Qt3DCore/qnode.h> diff --git a/src/core/qscene.h b/src/core/qscene_p.h index 1715d01fb..98a2dc85f 100644 --- a/src/core/qscene.h +++ b/src/core/qscene_p.h @@ -34,12 +34,11 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENE_H -#define QT3D_QSCENE_H - -#include <Qt3DCore/qt3dcore_global.h> -#include <Qt3DCore/qsceneinterface.h> +#ifndef QT3D_QSCENE_P_H +#define QT3D_QSCENE_P_H +#include <Qt3DCore/private/qt3dcore_global_p.h> +#include <Qt3DCore/private/qobservableinterface_p.h> #include <QScopedPointer> QT_BEGIN_NAMESPACE @@ -50,7 +49,9 @@ class QNode; class QScenePrivate; class QAspectEngine; -class QT3DCORESHARED_EXPORT QScene : public QSceneInterface +typedef QList<QObservableInterface *> QObservableList; + +class QT3DCORE_PRIVATE_EXPORT QScene { public: QScene(QAspectEngine *engine = Q_NULLPTR); @@ -58,21 +59,21 @@ public: QAspectEngine *engine() const; - void addObservable(QObservableInterface *observable, const QNodeId &id) Q_DECL_OVERRIDE; - void addObservable(QNode *observable) Q_DECL_OVERRIDE; - void removeObservable(QObservableInterface *observable, const QNodeId &id) Q_DECL_OVERRIDE; - void removeObservable(QNode *observable) Q_DECL_OVERRIDE; - QObservableList lookupObservables(const QNodeId &id) const Q_DECL_OVERRIDE; + void addObservable(QObservableInterface *observable, const QNodeId &id); + void addObservable(QNode *observable); + void removeObservable(QObservableInterface *observable, const QNodeId &id); + void removeObservable(QNode *observable); + QObservableList lookupObservables(const QNodeId &id) const; - QNode *lookupNode(const QNodeId &id) const Q_DECL_OVERRIDE; - QNodeId nodeIdFromObservable(QObservableInterface *observable) const Q_DECL_OVERRIDE; + QNode *lookupNode(const QNodeId &id) const; + QNodeId nodeIdFromObservable(QObservableInterface *observable) const; - void setArbiter(Qt3D::QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE; + void setArbiter(Qt3D::QLockableObserverInterface *arbiter); // Component -> Entities - QList<QNodeId> entitiesForComponent(const QNodeId &id) const Q_DECL_OVERRIDE; - void addEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) Q_DECL_OVERRIDE; - void removeEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) Q_DECL_OVERRIDE; + QList<QNodeId> entitiesForComponent(const QNodeId &id) const; + void addEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid); + void removeEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid); private: Q_DECLARE_PRIVATE(QScene) @@ -83,4 +84,6 @@ private: QT_END_NAMESPACE -#endif // QT3D_QSCENE_H +Q_DECLARE_METATYPE(Qt3D::QScene*) + +#endif // QT3D_QSCENE_P_H diff --git a/src/core/qsceneinterface.h b/src/core/qsceneinterface.h deleted file mode 100644 index 6f162f709..000000000 --- a/src/core/qsceneinterface.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_QSCENEINTERFACE_H -#define QT3D_QSCENEINTERFACE_H - -#include <Qt3DCore/qt3dcore_global.h> -#include <QObject> -#include <Qt3DCore/qnodeid.h> - -QT_BEGIN_NAMESPACE - -class QUuid; - -namespace Qt3D { - -class QNode; -class QObservableInterface; -class QLockableObserverInterface; - -typedef QList<QObservableInterface *> QObservableList; - -class QT3DCORESHARED_EXPORT QSceneInterface -{ -public: - virtual ~QSceneInterface() {} - virtual void addObservable(QObservableInterface *observable, const QNodeId &id) = 0; - virtual void addObservable(QNode *observable) = 0; - virtual void removeObservable(QObservableInterface *observable, const QNodeId &id) = 0; - virtual void removeObservable(QNode *observable) = 0; - virtual QObservableList lookupObservables(const QNodeId &id) const = 0; - virtual QNode *lookupNode(const QNodeId &id) const = 0; - virtual QNodeId nodeIdFromObservable(QObservableInterface *observable) const = 0; - virtual void setArbiter(QLockableObserverInterface *arbiter) = 0; - - virtual QList<QNodeId> entitiesForComponent(const QNodeId &componentUuid) const = 0; - virtual void addEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) = 0; - virtual void removeEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) = 0; -}; - -} // Qt3D - -QT_END_NAMESPACE - -Q_DECLARE_METATYPE(Qt3D::QSceneInterface *) - -#endif // QSCENEINTERFACE_H diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp index c8b97971c..e6c8fcc34 100644 --- a/src/input/qkeyboardcontroller.cpp +++ b/src/input/qkeyboardcontroller.cpp @@ -37,7 +37,7 @@ #include "qkeyboardcontroller.h" #include "qkeyboardcontroller_p.h" #include "qkeyboardinput.h" -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -95,10 +95,11 @@ QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode * void QKeyboardController::sceneChangeEvent(const QSceneChangePtr &change) { + Q_D(QKeyboardController); QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated && e->propertyName() == QByteArrayLiteral("activeInput")) { QNodeId activeInputId = e->value().value<QNodeId>(); - setActiveInput(qobject_cast<QKeyboardInput *>(scene()->lookupNode(activeInputId))); + setActiveInput(qobject_cast<QKeyboardInput *>(d->scene()->lookupNode(activeInputId))); } } diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp index 2ee792af7..5efb7d0aa 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp +++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/QAspectEngine> #include <Qt3DCore/QCamera> -#include <Qt3DCore/QScene> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DInput/QInputAspect> @@ -80,7 +80,7 @@ QCamera *Quick3DConfiguration::controlledCamera() const void Quick3DConfiguration::applyControlledCameraChange() { - QScene *scene = static_cast<QScene*>(QNodePrivate::get(m_camera)->scene()); + QScene *scene = QNodePrivate::get(m_camera)->scene(); // Too early, let's try again later if (!scene) { diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/renderscene.cpp index ffd779e39..343b7a8d9 100644 --- a/src/render/backend/renderscene.cpp +++ b/src/render/backend/renderscene.cpp @@ -37,7 +37,7 @@ #include "renderscene_p.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <Qt3DRenderer/qabstractsceneloader.h> #include <Qt3DRenderer/private/scenemanager_p.h> diff --git a/src/render/frontend/qsceneloader.cpp b/src/render/frontend/qsceneloader.cpp index cc0a25afa..eee55f813 100644 --- a/src/render/frontend/qsceneloader.cpp +++ b/src/render/frontend/qsceneloader.cpp @@ -36,7 +36,7 @@ #include "qsceneloader.h" #include "qabstractsceneloader_p.h" -#include <Qt3DCore/qsceneinterface.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qentity.h> #include <Qt3DRenderer/private/renderlogging_p.h> diff --git a/tests/auto/core/cloning/tst_cloning.cpp b/tests/auto/core/cloning/tst_cloning.cpp index 96e98f334..1ea911698 100644 --- a/tests/auto/core/cloning/tst_cloning.cpp +++ b/tests/auto/core/cloning/tst_cloning.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qscene.h> +#include <Qt3DCore/private/qscene_p.h> class tst_Cloning : public QObject { diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index d2248aa93..66751f3cf 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcomponent.h> -#include <Qt3DCore/qscene.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qlockableobserverinterface_p.h> diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index d405358fd..242b24ae8 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -41,7 +41,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qscenechange.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DCore/qscene.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qnode.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qsceneobserverinterface.h> @@ -254,7 +254,7 @@ public: tst_PostManObserver() : m_sceneInterface(Q_NULLPTR) {} - void setScene(Qt3D::QSceneInterface *scene) + void setScene(Qt3D::QScene *scene) { m_sceneInterface = scene; } @@ -283,7 +283,7 @@ public: } private: - Qt3D::QSceneInterface *m_sceneInterface; + Qt3D::QScene *m_sceneInterface; QList<Qt3D::QSceneChangePtr> m_lastChanges; }; diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index 9c76b9eb6..a363af18e 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DCore/qscene.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qnode.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcomponent.h> |