From 1d03c298fa27e2747fd41a9b5378135d57656fd9 Mon Sep 17 00:00:00 2001
From: Jere Tuliniemi <jere.tuliniemi@qt.io>
Date: Tue, 9 May 2017 12:34:37 +0300
Subject: Implement PIMPL for Qt3DQuickWindow

Moved private members of Qt3DQuickWindow to Qt3DQuickWindowPrivate to
hide implementation. m_engine is now a normal pointer so that it can
be deleted in the Qt3DQuickWindow destructor.

Task-number: QTBUG-60426
Change-Id: I99dd1b89aa2036272add7ba276e9b8f0c867e4a1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/quick3d/quick3dextras/qt3dquickwindow.h | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/quick3d/quick3dextras/qt3dquickwindow.h')

diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h
index 1b4d3fabf..0880fc160 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.h
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.h
@@ -84,6 +84,7 @@ namespace Qt3DExtras {
 
 namespace Quick {
 
+class Qt3DQuickWindowPrivate;
 
 class QT3DQUICKEXTRASSHARED_EXPORT Qt3DQuickWindow : public QWindow
 {
@@ -121,18 +122,7 @@ private:
     void setCameraAspectModeHelper();
     void updateCameraAspectRatio();
 
-    QScopedPointer<Qt3DCore::Quick::QQmlAspectEngine> m_engine;
-
-    // Aspects
-    Qt3DRender::QRenderAspect *m_renderAspect;
-    Qt3DInput::QInputAspect *m_inputAspect;
-    Qt3DLogic::QLogicAspect *m_logicAspect;
-
-    QUrl m_source;
-    bool m_initialized;
-    QPointer<Qt3DRender::QCamera> m_camera;
-    CameraAspectRatioMode m_cameraAspectRatioMode;
-    QQmlIncubationController *m_incubationController;
+    Q_DECLARE_PRIVATE(Qt3DQuickWindow)
 };
 
 } // Quick
-- 
cgit v1.2.3