diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 10:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 10:58:43 +0100 |
| commit | 3c7562963625f4baaa6d692ad51df46171bbd7ed (patch) | |
| tree | b5710d4ad4456a187c179c004caa9d1a8a2b92a7 /src/quick3d/imports/scene3d/scene3drenderer_p.h | |
| parent | 907869e8f87bab55671bfabf29f773cc01f40b68 (diff) | |
| parent | 02d01a68971747f01a270226f6474190736939cf (diff) | |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I9c8aa5d2010fcc622b9cce3031e58a46b74ea2fa
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3drenderer_p.h')
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index 692390bb6..eb2b930ef 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -53,6 +53,7 @@ #include <QtCore/QObject> #include <QtCore/qsize.h> +#include <QtCore/QMutex> QT_BEGIN_NAMESPACE @@ -102,6 +103,8 @@ private: QScopedPointer<QSGTexture> m_texture; Scene3DSGNode *m_node; // Will be released by the QtQuick SceneGraph Scene3DCleaner *m_cleaner; + QQuickWindow *m_window; + QMutex m_windowMutex; QSize m_lastSize; bool m_multisample; bool m_lastMultisample; |