From a01abdc3f2541117efbb5a57bf6234359a569420 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Tue, 21 Jun 2022 14:26:36 +0100
Subject: 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>
---
 src/logic/qlogicaspect.cpp                | 1 -
 src/logic/qlogicaspect_p.h                | 1 -
 src/render/geometry/qgeometryrenderer.cpp | 1 +
 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
-- 
cgit v1.2.3