diff options
author | Mike Krus <mike.krus@kdab.com> | 2022-06-21 14:26:36 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2022-06-29 22:25:37 +0100 |
commit | a01abdc3f2541117efbb5a57bf6234359a569420 (patch) | |
tree | ac19c74f4a23f902678ddee3858ee0168982b1cd | |
parent | da3ffd74be79d8d4bb49fa833ef32fcaf35963be (diff) |
Fix compile warnings
(manual pick from dev as 6.4 was missing)
Task-number: QTBUG-103286
Change-Id: I6df471706c0d09386b867dad20935b8184a3445b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/logic/qlogicaspect.cpp | 1 | ||||
-rw-r--r-- | src/logic/qlogicaspect_p.h | 1 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 1 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.h | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp index 105aae6a2..2fa783620 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -34,7 +34,6 @@ namespace Qt3DLogic { QLogicAspectPrivate::QLogicAspectPrivate() : QAbstractAspectPrivate() , m_time(0) - , m_initialized(false) , m_manager(new Logic::Manager) , m_executor(new Logic::Executor) , m_callbackJob(new Logic::CallbackJob) diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h index 2fd8f6316..97a057507 100644 --- a/src/logic/qlogicaspect_p.h +++ b/src/logic/qlogicaspect_p.h @@ -39,7 +39,6 @@ class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate void registerBackendTypes(); qint64 m_time; - bool m_initialized; QScopedPointer<Logic::Manager> m_manager; QScopedPointer<Logic::Executor> m_executor; QSharedPointer<Logic::CallbackJob> m_callbackJob; diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 505b86639..7c7f8f7a7 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -218,6 +218,7 @@ void QGeometryRendererPrivate::setView(QGeometryView *view) QGeometryRenderer::QGeometryRenderer(QNode *parent) : Qt3DCore::QBoundingVolume(*new QGeometryRendererPrivate(), parent) { + Q_UNUSED(m_sortIndex) } /*! diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 3c82f4963..71333e850 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -100,7 +100,7 @@ protected: private: Q_DECLARE_PRIVATE(QGeometryRenderer) - float m_sortIndex; + float m_sortIndex; // TODO Remove in Qt 7 }; } // namespace Qt3DRender |