diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/quick3d/quick3dextras/qt3dquickwindow.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/quick3d/quick3dextras/qt3dquickwindow.h')
-rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index a8703093e..0880fc160 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -52,9 +52,9 @@ #define QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H #include <Qt3DQuickExtras/qt3dquickextras_global.h> -#include <QQuickWindow> +#include <QtCore/QUrl> #include <QtCore/qpointer.h> -#include <QUrl> +#include <QtQuick/QQuickWindow> QT_BEGIN_NAMESPACE @@ -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 |