diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
| commit | 9f8fc3717508a6b8045f65e6c820692fb67dc450 (patch) | |
| tree | ad426afcaa91f61ecd669fbc416838f108554771 /src/quick3d/quick3dextras/qt3dquickwindow.h | |
| parent | a830a9365832fd52c1849768543a64c55e4cee0a (diff) | |
| parent | cd9059a22604307f483764db134d51b15c540758 (diff) | |
Merge branch '5.9' into dev
Conflicts:
.qmake.conf
src/core/qscene.cpp
src/plugins/sceneparsers/gltf/gltfimporter.cpp
src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
src/render/texture/gltexture.cpp
Change-Id: I7bde0fc0177eae252fef01cc43725fcf69c13a80
Diffstat (limited to 'src/quick3d/quick3dextras/qt3dquickwindow.h')
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 14 |
1 files changed, 2 insertions, 12 deletions
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 |