diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-20 14:57:26 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-20 14:57:53 +0100 |
| commit | cd9059a22604307f483764db134d51b15c540758 (patch) | |
| tree | 9ceea8edf2b41e55f17a49552d9cf37fcdedc9b2 /src/quick3d/quick3dscene2d/items/qscene2d_p.h | |
| parent | 1d024678ba16dd979a8c7023b35cdc76db357d37 (diff) | |
| parent | 9bf4daddeb62ec6a40e2d90587a7327acbb3780f (diff) | |
Merge branch '5.9.0' into 5.9
Change-Id: Icb23dcb19d312559f5f4a71bde3dc26bf4a19408
Diffstat (limited to 'src/quick3d/quick3dscene2d/items/qscene2d_p.h')
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d_p.h b/src/quick3d/quick3dscene2d/items/qscene2d_p.h index e40d3d6a9..217058f5c 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d_p.h @@ -55,6 +55,10 @@ QT_BEGIN_NAMESPACE +namespace Qt3DCore { +class QScene; +} + namespace Qt3DRender { namespace Quick { @@ -70,6 +74,8 @@ public: QScene2DPrivate(); ~QScene2DPrivate(); + void setScene(Qt3DCore::QScene *scene) Q_DECL_OVERRIDE; + Scene2DManager *m_renderManager; QMetaObject::Connection m_textureDestroyedConnection; Qt3DRender::QRenderTargetOutput *m_output; @@ -82,6 +88,7 @@ struct QScene2DData Scene2DSharedObjectPtr sharedObject; Qt3DCore::QNodeId output; QVector<Qt3DCore::QNodeId> entityIds; + bool mouseEnabled; }; } // namespace Quick |