summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2022-06-21 14:26:36 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-27 13:53:26 +0000
commit04e7085f0e460730e3603659535716b542e88d06 (patch)
tree99a3d03ead92a85ce60b5070f6a083be16b9a301
parentce57ce478ea9e6c8a80f97f6a6e2bbbe87dbfdb2 (diff)
Fix compile warnings
Task-number: QTBUG-103286 Change-Id: Ie97b6e5375338007ebba4d1a6ae235f068453fb5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 2624bc4e7ade11cdb210b2bb27fb0ffd971036a7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-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 cd9b3e47a..39114ad39 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -70,7 +70,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 2a6a7259a..d3388c72c 100644
--- a/src/logic/qlogicaspect_p.h
+++ b/src/logic/qlogicaspect_p.h
@@ -75,7 +75,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 036235624..f11405e3f 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -254,6 +254,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 c0e14eaaf..65eba247e 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -136,7 +136,7 @@ protected:
private:
Q_DECLARE_PRIVATE(QGeometryRenderer)
- float m_sortIndex;
+ float m_sortIndex; // TODO Remove in Qt 7
};
} // namespace Qt3DRender