diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 11:20:14 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-18 13:50:53 +0200 |
| commit | adaa9c6e1e069d2f521d7b255cd5fd007a6857ad (patch) | |
| tree | c4b07f571e2767c2f4a9dec120ba6205892d56c6 /src/core/aspects/qaspectmanager_p.h | |
| parent | 44393fb6f482ef4787514ca87d73473452ffe847 (diff) | |
QAspectEngine/QAspectManager: setWindow -> setSurface
Change-Id: Ib6e2188bc5602f2684b49c7e1e37d62abb5a122f
Task-number:QTBUG-41521
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects/qaspectmanager_p.h')
| -rw-r--r-- | src/core/aspects/qaspectmanager_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index a67e32a2d..fa275f9ed 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QWaitCondition; -class QWindow; +class QSurface; namespace Qt3D { @@ -73,9 +73,9 @@ public Q_SLOTS: void shutdown(); void setRoot(Qt3D::QNode *rootObject); - void setWindow(QWindow* window); + void setSurface(QSurface *surface); void registerAspect(Qt3D::QAbstractAspect *aspect); - QWindow *window() const; + QSurface *surface() const; void exec(); void quit(); @@ -87,7 +87,7 @@ public Q_SLOTS: private: QList<QAbstractAspect *> m_aspects; QEntity *m_root; - QWindow *m_window; + QSurface *m_surface; QScheduler *m_scheduler; QJobManagerInterface *m_jobManager; QChangeArbiter *m_changeArbiter; |