diff options
34 files changed, 124 insertions, 1 deletions
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp index cd1cce464..53ae46809 100644 --- a/src/animation/frontend/qabstractanimationclip.cpp +++ b/src/animation/frontend/qabstractanimationclip.cpp @@ -133,6 +133,11 @@ QAbstractAnimationClip::QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd { } +// TODO Unused remove in Qt6 +void QAbstractAnimationClip::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! Destroys this animation clip. */ diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h index f68950c4c..fddee3dec 100644 --- a/src/animation/frontend/qabstractanimationclip.h +++ b/src/animation/frontend/qabstractanimationclip.h @@ -62,7 +62,8 @@ Q_SIGNALS: protected: QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr); - + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAbstractAnimationClip) }; diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp index cb4621182..8c282da49 100644 --- a/src/animation/frontend/qabstractclipanimator.cpp +++ b/src/animation/frontend/qabstractclipanimator.cpp @@ -122,6 +122,11 @@ QAbstractClipAnimator::QAbstractClipAnimator(QAbstractClipAnimatorPrivate &dd, Q { } +// TODO Unused remove in Qt6 +void QAbstractClipAnimator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + QAbstractClipAnimator::~QAbstractClipAnimator() { } diff --git a/src/animation/frontend/qabstractclipanimator.h b/src/animation/frontend/qabstractclipanimator.h index 687589b5e..dc9dc9077 100644 --- a/src/animation/frontend/qabstractclipanimator.h +++ b/src/animation/frontend/qabstractclipanimator.h @@ -94,6 +94,8 @@ protected: explicit QAbstractClipAnimator(Qt3DCore::QNode *parent = nullptr); QAbstractClipAnimator(QAbstractClipAnimatorPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAbstractClipAnimator) }; diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp index d3b2b5bf4..bf901e54f 100644 --- a/src/animation/frontend/qanimationcliploader.cpp +++ b/src/animation/frontend/qanimationcliploader.cpp @@ -112,6 +112,11 @@ QAnimationClipLoader::QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3D { } +// TODO Unused remove in Qt6 +void QAnimationClipLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + QAnimationClipLoader::~QAnimationClipLoader() { } diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h index 1ff388297..1b68e852f 100644 --- a/src/animation/frontend/qanimationcliploader.h +++ b/src/animation/frontend/qanimationcliploader.h @@ -78,6 +78,8 @@ Q_SIGNALS: protected: explicit QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAnimationClipLoader) diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp index e5902f11f..d41b87f79 100644 --- a/src/core/transforms/qtransform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -237,6 +237,7 @@ QTransform::QTransform(QTransformPrivate &dd, QNode *parent) /*! \internal */ +// TODO Unused remove in Qt6 void QTransform::sceneChangeEvent(const QSceneChangePtr &change) { Q_D(QTransform); diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index 503ea4d4a..ce6bf42fa 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -119,6 +119,7 @@ Q_SIGNALS: protected: explicit QTransform(QTransformPrivate &dd, QNode *parent = nullptr); + // TODO Unused remove in Qt6 void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 512a5aca7..8cceaab51 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -148,6 +148,11 @@ QVector<QAbstractActionInput *> QAction::inputs() const return d->m_inputs; } +// TODO Unused remove in Qt6 +void QAction::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + Qt3DCore::QNodeCreatedChangeBasePtr QAction::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QActionData>::create(this); diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h index 8175bab8e..ef74debe5 100644 --- a/src/input/frontend/qaction.h +++ b/src/input/frontend/qaction.h @@ -67,6 +67,10 @@ public: Q_SIGNALS: void activeChanged(bool isActive); +protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; + private: Q_DECLARE_PRIVATE(QAction) Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 7faa6a459..d76135fd7 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -167,6 +167,11 @@ float QAxis::value() const return d->m_value; } +// TODO Unused remove in Qt6 +void QAxis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + Qt3DCore::QNodeCreatedChangeBasePtr QAxis::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAxisData>::create(this); diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h index 1a542cf22..3dbe54a4f 100644 --- a/src/input/frontend/qaxis.h +++ b/src/input/frontend/qaxis.h @@ -66,6 +66,10 @@ public: Q_SIGNALS: void valueChanged(float value); +protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; + private: Q_DECLARE_PRIVATE(QAxis) Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp index 03f6e3bd1..a7bb14441 100644 --- a/src/input/frontend/qaxisaccumulator.cpp +++ b/src/input/frontend/qaxisaccumulator.cpp @@ -289,6 +289,11 @@ void QAxisAccumulator::setScale(float scale) emit scaleChanged(scale); } +// TODO Unused remove in Qt6 +void QAxisAccumulator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! \internal */ Qt3DCore::QNodeCreatedChangeBasePtr QAxisAccumulator::createNodeCreationChange() const { diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h index bb2e2696b..e711b0691 100644 --- a/src/input/frontend/qaxisaccumulator.h +++ b/src/input/frontend/qaxisaccumulator.h @@ -87,6 +87,10 @@ Q_SIGNALS: void velocityChanged(float value); void scaleChanged(float scale); +protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; + private: Q_DECLARE_PRIVATE(QAxisAccumulator) Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index 0fe3a1338..1ec1f8ead 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -309,6 +309,11 @@ QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent) { } +// TODO Unused remove in Qt6 +void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! * Set the active input to \a activeInput */ diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h index ee4b864f7..df2f47020 100644 --- a/src/input/frontend/qkeyboarddevice.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -71,6 +71,8 @@ public: protected: explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; Q_SIGNALS: void activeInputChanged(QKeyboardHandler *activeInput); diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 1581f763c..92ce39c31 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -237,6 +237,11 @@ void QKeyboardHandler::setFocus(bool focus) } } +// TODO Unused remove in Qt6 +void QKeyboardHandler::sceneChangeEvent(const QSceneChangePtr &) +{ +} + Qt3DCore::QNodeCreatedChangeBasePtr QKeyboardHandler::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QKeyboardHandlerData>::create(this); diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h index d69476286..b4425de72 100644 --- a/src/input/frontend/qkeyboardhandler.h +++ b/src/input/frontend/qkeyboardhandler.h @@ -115,6 +115,10 @@ Q_SIGNALS: void pressed(Qt3DInput::QKeyEvent *event); void released(Qt3DInput::QKeyEvent *event); +protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; + private: Q_DECLARE_PRIVATE(QKeyboardHandler) Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index f3e7a18c8..1d45d85b6 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -298,6 +298,11 @@ void QMouseHandler::setSourceDevice(QMouseDevice *mouseDevice) } } +// TODO Unused remove in Qt6 +void QMouseHandler::sceneChangeEvent(const QSceneChangePtr &) +{ +} + /*! * \property Qt3DInput::QMouseHandler::sourceDevice * diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h index 5331893b2..d95dbf4c3 100644 --- a/src/input/frontend/qmousehandler.h +++ b/src/input/frontend/qmousehandler.h @@ -87,6 +87,8 @@ Q_SIGNALS: #endif protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; void setContainsMouse(bool contains); private: diff --git a/src/render/frontend/qlevelofdetail.cpp b/src/render/frontend/qlevelofdetail.cpp index 3d0cb9553..ced0604c7 100644 --- a/src/render/frontend/qlevelofdetail.cpp +++ b/src/render/frontend/qlevelofdetail.cpp @@ -325,6 +325,11 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLevelOfDetail::createNodeCreationChange() c return creationChange; } +// TODO Unused remove in Qt6 +void QLevelOfDetail::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + QCamera *QLevelOfDetail::camera() const { Q_D(const QLevelOfDetail); diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index f6c09a287..81fcf3235 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -97,6 +97,8 @@ Q_SIGNALS: protected: explicit QLevelOfDetail(QLevelOfDetailPrivate &dd, Qt3DCore::QNode *parent = nullptr); Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QLevelOfDetail) diff --git a/src/render/frontend/qlevelofdetailswitch.cpp b/src/render/frontend/qlevelofdetailswitch.cpp index c0bbdc0f8..c07d4c4b1 100644 --- a/src/render/frontend/qlevelofdetailswitch.cpp +++ b/src/render/frontend/qlevelofdetailswitch.cpp @@ -133,6 +133,11 @@ QLevelOfDetailSwitch::QLevelOfDetailSwitch(QLevelOfDetailPrivate &dd, QNode *par { } +// TODO Unused remove in Qt6 +void QLevelOfDetailSwitch::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qlevelofdetailswitch.h b/src/render/frontend/qlevelofdetailswitch.h index 90f4ee3e2..325b885ed 100644 --- a/src/render/frontend/qlevelofdetailswitch.h +++ b/src/render/frontend/qlevelofdetailswitch.h @@ -57,6 +57,8 @@ public: protected: explicit QLevelOfDetailSwitch(QLevelOfDetailPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QLevelOfDetailSwitch) diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 6e0a24f61..64f3e058e 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -218,6 +218,11 @@ QGeometryRenderer::QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent { } +// TODO Unused remove in Qt6 +void QGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &) +{ +} + /*! \property QGeometryRenderer::instanceCount diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index eceeb9173..14de40d0b 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -134,6 +134,8 @@ Q_SIGNALS: protected: explicit QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QGeometryRenderer) diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 1d7d33f9a..f5307f7a9 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -215,6 +215,11 @@ QMesh::QMesh(QMeshPrivate &dd, QNode *parent) { } +// TODO Unused remove in Qt6 +void QMesh::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + void QMesh::setSource(const QUrl& source) { Q_D(QMesh); diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index 04fdedc20..e8ff52b35 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -88,6 +88,8 @@ Q_SIGNALS: protected: explicit QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QMesh) diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 1b6a56e36..7d4413bff 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -252,6 +252,11 @@ QSceneLoader::~QSceneLoader() { } +// TODO Unused remove in Qt6 +void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &) +{ +} + /*! \internal */ QSceneLoader::QSceneLoader(QSceneLoaderPrivate &dd, QNode *parent) : Qt3DCore::QComponent(dd, parent) diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 6842a6926..51ba42de7 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -60,6 +60,8 @@ public: explicit QSceneLoader(Qt3DCore::QNode *parent = nullptr); ~QSceneLoader(); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; enum Status { None = 0, Loading, diff --git a/src/render/materialsystem/qshaderprogrambuilder.cpp b/src/render/materialsystem/qshaderprogrambuilder.cpp index 6613661d1..7f98fbf5e 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.cpp +++ b/src/render/materialsystem/qshaderprogrambuilder.cpp @@ -135,6 +135,11 @@ QShaderProgramBuilder::QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Q { } +// TODO Unused remove in Qt6 +void QShaderProgramBuilder::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! \qmlproperty string ShaderProgramBuilder::shaderProgram diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h index 5dc6b54ff..48e189c8c 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.h +++ b/src/render/materialsystem/qshaderprogrambuilder.h @@ -117,6 +117,8 @@ Q_SIGNALS: protected: explicit QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QShaderProgramBuilder) diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 7d9741f21..b7f2c0815 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -292,6 +292,11 @@ void QObjectPicker::setPriority(int priority) } } +// TODO Unused remove in Qt6 +void QObjectPicker::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! \qmlproperty bool Qt3D.Render::ObjectPicker::dragEnabled */ diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h index ee63c9418..ea65040ba 100644 --- a/src/render/picking/qobjectpicker.h +++ b/src/render/picking/qobjectpicker.h @@ -77,6 +77,10 @@ public Q_SLOTS: void setDragEnabled(bool dragEnabled); Q_REVISION(13) void setPriority(int priority); +protected: + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; + Q_SIGNALS: void pressed(Qt3DRender::QPickEvent *pick); void released(Qt3DRender::QPickEvent *pick); |