diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
| commit | 5aedae5aa9251e1216d7bc1652cb1f451dd047c1 (patch) | |
| tree | 1e3c00ccac6cb4082d8bd3e52f047f8cbc058b61 /src/core/aspects/qaspectmanager_p.h | |
| parent | 532e108a3abf56aa0ef709af5049ce3b2161ed84 (diff) | |
| parent | df5a63b059956e8a717db9110327cc86612cc934 (diff) | |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Ia93046662955494eccd3f4da80f015fe5148b026
Diffstat (limited to 'src/core/aspects/qaspectmanager_p.h')
| -rw-r--r-- | src/core/aspects/qaspectmanager_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index ebc148324..12bf5d72a 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -76,6 +76,9 @@ class QAbstractAspectJobManager; class QServiceLocator; class NodePostConstructorInit; struct NodeTreeChange; +#if QT_CONFIG(animation) +class RequestFrameAnimation; +#endif class Q_3DCORE_PRIVATE_EXPORT QAspectManager : public QObject { @@ -112,7 +115,9 @@ public: QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const; private: +#if !QT_CONFIG(animation) bool event(QEvent *event) override; +#endif void requestNextFrame(); QVector<QAbstractAspect *> m_aspects; @@ -126,7 +131,9 @@ private: QAspectEngine::RunMode m_driveMode; QVector<NodeTreeChange> m_nodeTreeChanges; NodePostConstructorInit* m_postConstructorInit; - +#if QT_CONFIG(animation) + RequestFrameAnimation *m_simulationAnimation; +#endif }; } // namespace Qt3DCore |