From adaa9c6e1e069d2f521d7b255cd5fd007a6857ad Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Fri, 17 Oct 2014 11:20:14 +0200
Subject: QAspectEngine/QAspectManager: setWindow -> setSurface

Change-Id: Ib6e2188bc5602f2684b49c7e1e37d62abb5a122f
Task-number:QTBUG-41521
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/core/aspects/qaspectmanager_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/core/aspects/qaspectmanager_p.h')

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;
-- 
cgit v1.2.3