summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2022-06-21 14:26:36 +0100
committerMike Krus <mike.krus@kdab.com>2022-06-23 10:52:33 +0100
commit2624bc4e7ade11cdb210b2bb27fb0ffd971036a7 (patch)
tree97abfd02297541c946e87e6809d7e89ec02c94bc
parent400689d358f9c8dc05e556b04ff928ad32930c81 (diff)
Fix compile warnings
Task-number: QTBUG-103286 Pick-to: 6.3 6.2 5.15 Change-Id: Ie97b6e5375338007ebba4d1a6ae235f068453fb5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/logic/qlogicaspect.cpp1
-rw-r--r--src/logic/qlogicaspect_p.h1
-rw-r--r--src/render/geometry/qgeometryrenderer.cpp1
-rw-r--r--src/render/geometry/qgeometryrenderer.h2
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