diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-07-03 16:40:16 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-07-06 16:06:13 +0000 |
| commit | 6186037a6d6e2bc51cca2c088aa0f0ea3d2a828d (patch) | |
| tree | 7320f93e043c83d7e5e0e95fbdc008830b75dd71 /tests | |
| parent | 0f5e169cdc2903ce5a6daac34459cb3f4506053b (diff) | |
QScene is now private
QSceneInterface was removed as it didn't make sense anymore
Change-Id: I1110d1dcef72bd7654d773370ab304ac06515037
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/cloning/tst_cloning.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/core/nodes/tst_nodes.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/core/qscene/tst_qscene.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
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> |