diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-26 13:51:23 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-26 14:08:06 +0000 |
commit | 7f625e93620b313466d0223e911c0c3a5b492617 (patch) | |
tree | 22bc8ce1ab8fb82cf6fdb82062ad501982bc6f5f /src/quick3d/imports/scene3d/scene3drenderer_p.h | |
parent | 6b4d0c1e55809c5a2e0b5d344dddf355dd983085 (diff) |
Fix deprecations and warnings
In particular:
- QHash::unite deprecated
- QQuickWindow::createTextureFromId deprecated
- also removed unused or deprecated code, and fixed out of order
initialization
Change-Id: Ia583654fcfcd654ca388575aa7716c282b134e33
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3drenderer_p.h')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index 08a2c60a3..b558359c6 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -123,6 +123,7 @@ private: QSemaphore m_allowRendering; Scene3DItem::CompositingMode m_compositingMode; QVector<Scene3DView *> m_views; + quint32 m_textureId; friend class Scene3DCleaner; }; |