diff options
Diffstat (limited to 'src')
112 files changed, 7 insertions, 192 deletions
diff --git a/src/animation/backend/blendedclipanimator.cpp b/src/animation/backend/blendedclipanimator.cpp index 254883478..8e76ec233 100644 --- a/src/animation/backend/blendedclipanimator.cpp +++ b/src/animation/backend/blendedclipanimator.cpp @@ -41,7 +41,6 @@ #include <Qt3DAnimation/qabstractclipblendnode.h> #include <Qt3DAnimation/private/qblendedclipanimator_p.h> #include <Qt3DAnimation/private/qanimationcallbacktrigger_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/backend/channelmapper.cpp b/src/animation/backend/channelmapper.cpp index 7ea07557b..e5d4eb009 100644 --- a/src/animation/backend/channelmapper.cpp +++ b/src/animation/backend/channelmapper.cpp @@ -40,9 +40,6 @@ #include <Qt3DAnimation/private/qchannelmapper_p.h> #include <Qt3DAnimation/private/animationlogging_p.h> #include <Qt3DAnimation/private/managers_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <algorithm> diff --git a/src/animation/backend/clipanimator.cpp b/src/animation/backend/clipanimator.cpp index b6bcc9239..4fe23819e 100644 --- a/src/animation/backend/clipanimator.cpp +++ b/src/animation/backend/clipanimator.cpp @@ -43,8 +43,6 @@ #include <Qt3DAnimation/private/managers_p.h> #include <Qt3DAnimation/private/animationlogging_p.h> #include <Qt3DAnimation/private/qanimationcallbacktrigger_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/backend/clipblendnode.cpp b/src/animation/backend/clipblendnode.cpp index 81fc61910..57fbdb920 100644 --- a/src/animation/backend/clipblendnode.cpp +++ b/src/animation/backend/clipblendnode.cpp @@ -37,8 +37,6 @@ #include "clipblendnode_p.h" #include <Qt3DAnimation/qclipblendnodecreatedchange.h> #include <Qt3DAnimation/qabstractanimationclip.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/backend/clipblendvalue.cpp b/src/animation/backend/clipblendvalue.cpp index e1586953b..0db9544f6 100644 --- a/src/animation/backend/clipblendvalue.cpp +++ b/src/animation/backend/clipblendvalue.cpp @@ -38,7 +38,6 @@ #include <Qt3DAnimation/qclipblendnodecreatedchange.h> #include <Qt3DAnimation/qclipblendvalue.h> #include <Qt3DAnimation/private/qclipblendvalue_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/backend/clock.cpp b/src/animation/backend/clock.cpp index ab30f735c..a9446c2d6 100644 --- a/src/animation/backend/clock.cpp +++ b/src/animation/backend/clock.cpp @@ -38,8 +38,6 @@ #include <Qt3DAnimation/qclock.h> #include <Qt3DAnimation/private/qclock_p.h> #include <Qt3DAnimation/private/animationutils_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp index f312ddaa5..53f7a5e33 100644 --- a/src/animation/frontend/qcallbackmapping.cpp +++ b/src/animation/frontend/qcallbackmapping.cpp @@ -38,7 +38,6 @@ #include "qcallbackmapping_p.h" #include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtCore/qmetaobject.h> #include <QtCore/QMetaProperty> diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp index 34b5ffbe6..2146290e4 100644 --- a/src/animation/frontend/qchannelmapper.cpp +++ b/src/animation/frontend/qchannelmapper.cpp @@ -37,8 +37,6 @@ #include "qchannelmapper.h" #include "qchannelmapper_p.h" #include <Qt3DAnimation/qchannelmapping.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp index fa89d5042..59620ab49 100644 --- a/src/animation/frontend/qchannelmapping.cpp +++ b/src/animation/frontend/qchannelmapping.cpp @@ -38,7 +38,6 @@ #include "qchannelmapping_p.h" #include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtCore/qmetaobject.h> #include <QtCore/QMetaProperty> diff --git a/src/animation/frontend/qclock.cpp b/src/animation/frontend/qclock.cpp index 717982902..f38c21807 100644 --- a/src/animation/frontend/qclock.cpp +++ b/src/animation/frontend/qclock.cpp @@ -36,7 +36,6 @@ #include "qclock.h" #include "qclock_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index 2fe3c8094..773d2df88 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -40,7 +40,6 @@ #include "qcomponent.h" #include "qcomponent_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> #include <Qt3DCore/qentity.h> diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 0ff8c4646..58b5ef33e 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -44,7 +44,6 @@ #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtCore/QMetaObject> #include <QtCore/QMetaProperty> diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 2cea47372..4dda92ec6 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -526,10 +526,11 @@ void QNodePrivate::_q_ensureBackendNodeCreated() * Sends the \a change QSceneChangePtr to any QBackendNodes in the registered * aspects that correspond to this QNode. * - * For the common case of a QObject property change, QNode handles this for you - * automatically by sending a QPropertyUpdatedChange event to the backend nodes. * You only need to call this function if you wish to send a specific type of * change in place of the automatic handling. + * + * Note: as of Qt 5.14, change messages are deprecated and should not be used, + * in particular for properties. */ void QNode::notifyObservers(const QSceneChangePtr &change) { diff --git a/src/core/transforms/qjoint.cpp b/src/core/transforms/qjoint.cpp index 553fbd654..c13b388e2 100644 --- a/src/core/transforms/qjoint.cpp +++ b/src/core/transforms/qjoint.cpp @@ -41,9 +41,6 @@ #include "qjoint_p.h" #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/extras/text/qtextureatlas.cpp b/src/extras/text/qtextureatlas.cpp index 1f4b22d83..4ab992224 100644 --- a/src/extras/text/qtextureatlas.cpp +++ b/src/extras/text/qtextureatlas.cpp @@ -41,9 +41,6 @@ #include "qtextureatlas_p_p.h" #include <Qt3DRender/qtexturedata.h> #include <Qt3DRender/qabstracttextureimage.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/abstractaxisinput.cpp b/src/input/backend/abstractaxisinput.cpp index de957c73a..f69c046b3 100644 --- a/src/input/backend/abstractaxisinput.cpp +++ b/src/input/backend/abstractaxisinput.cpp @@ -41,7 +41,6 @@ #include "qabstractaxisinput_p.h" #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/abstractaxisinput_p.h> #include <Qt3DInput/private/inputhandler_p.h> diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp index a67408222..cb7e93a0c 100644 --- a/src/input/backend/action.cpp +++ b/src/input/backend/action.cpp @@ -42,8 +42,6 @@ #include <Qt3DInput/qaction.h> #include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DInput/private/qaction_p.h> diff --git a/src/input/backend/analogaxisinput.cpp b/src/input/backend/analogaxisinput.cpp index 845bfad85..9dece6b9b 100644 --- a/src/input/backend/analogaxisinput.cpp +++ b/src/input/backend/analogaxisinput.cpp @@ -41,7 +41,6 @@ #include <Qt3DInput/qanalogaxisinput.h> #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> #include <Qt3DInput/private/qanalogaxisinput_p.h> diff --git a/src/input/backend/axissetting.cpp b/src/input/backend/axissetting.cpp index de5c3f3ca..53e645c4d 100644 --- a/src/input/backend/axissetting.cpp +++ b/src/input/backend/axissetting.cpp @@ -40,7 +40,6 @@ #include "axissetting_p.h" #include <Qt3DInput/qaxissetting.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/qaxissetting_p.h> diff --git a/src/input/backend/buttonaxisinput.cpp b/src/input/backend/buttonaxisinput.cpp index ef67ce1fc..011d7df56 100644 --- a/src/input/backend/buttonaxisinput.cpp +++ b/src/input/backend/buttonaxisinput.cpp @@ -41,7 +41,6 @@ #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> #include <Qt3DInput/private/qbuttonaxisinput_p.h> diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp index 5716e3344..fa8112e6d 100644 --- a/src/input/backend/inputchord.cpp +++ b/src/input/backend/inputchord.cpp @@ -40,9 +40,6 @@ #include "inputchord_p.h" #include <Qt3DInput/qinputchord.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DInput/private/qinputchord_p.h> #include <Qt3DInput/private/inputhandler_p.h> diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp index c4d5580dd..690a7f0d1 100644 --- a/src/input/backend/inputsequence.cpp +++ b/src/input/backend/inputsequence.cpp @@ -41,9 +41,6 @@ #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qinputsequence.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtCore/QDateTime> #include <Qt3DInput/private/inputhandler_p.h> diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp index 7849640bd..4fdd61a1b 100644 --- a/src/input/backend/inputsettings.cpp +++ b/src/input/backend/inputsettings.cpp @@ -40,7 +40,6 @@ #include "inputsettings_p.h" #include <Qt3DInput/qinputsettings.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/qinputsettings_p.h> diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index 6bea0d85d..17426922f 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -42,9 +42,6 @@ #include <Qt3DInput/qaction.h> #include <Qt3DInput/qaxis.h> #include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/inputmanagers_p.h> #include <Qt3DInput/private/qlogicaldevice_p.h> diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp index ab2458bc0..47045a1a1 100644 --- a/src/input/backend/mousedevice.cpp +++ b/src/input/backend/mousedevice.cpp @@ -42,7 +42,6 @@ #include <Qt3DInput/qmousedevice.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qnode.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/inputmanagers_p.h> #include <Qt3DInput/private/inputhandler_p.h> diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index e9a7721d7..6e6899e32 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -44,9 +44,6 @@ #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DInput/qphysicaldevicecreatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <cmath> #include <algorithm> diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index b925f8ed3..8cadf95a1 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -42,9 +42,6 @@ #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qphysicaldevicecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnode_p.h> diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 6eeaa6676..4dc0493b0 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -42,8 +42,6 @@ #include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/private/qnode_p.h> diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 082ad4f67..c60c4bbe9 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -41,8 +41,6 @@ #include <Qt3DInput/qabstractaxisinput.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 8869d2116..2069be633 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -41,9 +41,6 @@ #include "qlogicaldevice_p.h" #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/qaction.h> #include <Qt3DInput/qaxis.h> diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp index 1176d8e8e..2b967f2d2 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp @@ -40,8 +40,6 @@ #include "scene2dmanager_p.h" #include "scene2devent_p.h" -#include <Qt3DCore/QPropertyUpdatedChange> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp index 1dd798d94..cb9973f0a 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp @@ -41,8 +41,6 @@ #include "scene2devent_p.h" #include "scene2dsharedobject_p.h" -#include <Qt3DCore/QPropertyUpdatedChange> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 7a5c1f7e6..85c5e9656 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -47,7 +47,6 @@ #include <Qt3DRender/private/sphere_p.h> #include <Qt3DRender/private/computefilteredboundingvolumejob_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qtransform.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 8be58dd46..a5d7ebe7e 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -62,7 +62,6 @@ #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/private/qentity_p.h> #include <Qt3DCore/qnodecreatedchange.h> diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp index f0c844906..f1b6d2fc6 100644 --- a/src/render/backend/layer.cpp +++ b/src/render/backend/layer.cpp @@ -41,7 +41,6 @@ #include <Qt3DRender/qlayer.h> #include <Qt3DRender/private/qlayer_p.h> #include <Qt3DRender/private/stringtoint_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp index 702be9c60..487f6e11a 100644 --- a/src/render/backend/rendersettings.cpp +++ b/src/render/backend/rendersettings.cpp @@ -43,7 +43,6 @@ #include <Qt3DRender/private/abstractrenderer_p.h> #include <Qt3DRender/private/qrendersettings_p.h> #include <Qt3DCore/qnodecommand.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 206f64e4e..088818c94 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -41,9 +41,6 @@ #include <Qt3DRender/qrendertarget.h> #include <Qt3DRender/private/qrendertarget_p.h> #include <Qt3DRender/qrendertargetoutput.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertargetoutput.cpp b/src/render/backend/rendertargetoutput.cpp index edfc7132e..e98acf3b8 100644 --- a/src/render/backend/rendertargetoutput.cpp +++ b/src/render/backend/rendertargetoutput.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <Qt3DRender/private/rendertargetoutput_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/private/qrendertargetoutput_p.h> #include <QVariant> diff --git a/src/render/framegraph/blitframebuffer.cpp b/src/render/framegraph/blitframebuffer.cpp index c45d3fdbc..0ecfbf5c4 100644 --- a/src/render/framegraph/blitframebuffer.cpp +++ b/src/render/framegraph/blitframebuffer.cpp @@ -39,7 +39,6 @@ #include <Qt3DRender/private/qblitframebuffer_p.h> #include <Qt3DRender/private/blitframebuffer_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/buffercapture.cpp b/src/render/framegraph/buffercapture.cpp index 4e89150df..b5e80eb29 100644 --- a/src/render/framegraph/buffercapture.cpp +++ b/src/render/framegraph/buffercapture.cpp @@ -40,7 +40,6 @@ #include <Qt3DRender/private/qbuffercapture_p.h> #include <Qt3DRender/private/buffercapture_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 482429b00..3beb0ef71 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -40,9 +40,7 @@ #include "cameraselectornode_p.h" #include <Qt3DRender/private/qcameraselector_p.h> #include <Qt3DRender/private/renderer_p.h> -#include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp index 7d018c935..eae864cc1 100644 --- a/src/render/framegraph/clearbuffers.cpp +++ b/src/render/framegraph/clearbuffers.cpp @@ -39,7 +39,6 @@ #include "clearbuffers_p.h" #include <Qt3DRender/private/qclearbuffers_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/dispatchcompute.cpp b/src/render/framegraph/dispatchcompute.cpp index 5eae75bc6..4161d37b5 100644 --- a/src/render/framegraph/dispatchcompute.cpp +++ b/src/render/framegraph/dispatchcompute.cpp @@ -39,7 +39,6 @@ #include "dispatchcompute_p.h" #include <Qt3DRender/private/qdispatchcompute_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp index 93531fd7d..58ff05dc0 100644 --- a/src/render/framegraph/framegraphnode.cpp +++ b/src/render/framegraph/framegraphnode.cpp @@ -41,7 +41,6 @@ #include <Qt3DRender/private/renderer_p.h> #include <Qt3DRender/private/nodemanagers_p.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/frustumculling.cpp b/src/render/framegraph/frustumculling.cpp index 9f38d6be9..cf3a4ec57 100644 --- a/src/render/framegraph/frustumculling.cpp +++ b/src/render/framegraph/frustumculling.cpp @@ -39,7 +39,6 @@ #include "frustumculling_p.h" #include <Qt3DRender/qfrustumculling.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index 5c53fa681..f50fc1306 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -40,9 +40,6 @@ #include "layerfilternode_p.h" #include "qlayerfilter.h" #include <Qt3DRender/private/qlayerfilter_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <algorithm> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/memorybarrier.cpp b/src/render/framegraph/memorybarrier.cpp index 6bfaedda7..bcc81464a 100644 --- a/src/render/framegraph/memorybarrier.cpp +++ b/src/render/framegraph/memorybarrier.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "memorybarrier_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qmemorybarrier_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index f2020d7ce..f64eb92d7 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -39,7 +39,6 @@ #include "nodraw_p.h" #include <Qt3DRender/qnodraw.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/proximityfilter.cpp b/src/render/framegraph/proximityfilter.cpp index 593e541bc..03dd2a7ec 100644 --- a/src/render/framegraph/proximityfilter.cpp +++ b/src/render/framegraph/proximityfilter.cpp @@ -39,7 +39,6 @@ #include "proximityfilter_p.h" #include <Qt3DRender/private/qproximityfilter_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp index bf9e547cb..3a26e3d56 100644 --- a/src/render/framegraph/qblitframebuffer.cpp +++ b/src/render/framegraph/qblitframebuffer.cpp @@ -40,7 +40,6 @@ #include "qblitframebuffer.h" #include "qblitframebuffer_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp index d1d301077..0c12a3aff 100644 --- a/src/render/framegraph/qbuffercapture.cpp +++ b/src/render/framegraph/qbuffercapture.cpp @@ -40,7 +40,6 @@ #include <Qt3DRender/qbuffercapture.h> #include <Qt3DRender/private/qbuffercapture_p.h> #include <Qt3DCore/QSceneChange> -#include <Qt3DCore/QPropertyUpdatedChange> #include <Qt3DRender/QFrameGraphNodeCreatedChange> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index 45abf638e..af293dc56 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -41,7 +41,6 @@ #include "qcameraselector_p.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qentity_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp index 4cc4c98b6..31a31420c 100644 --- a/src/render/framegraph/qclearbuffers.cpp +++ b/src/render/framegraph/qclearbuffers.cpp @@ -39,7 +39,6 @@ #include "qclearbuffers.h" #include "qclearbuffers_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index 1ef81a081..2390cb1c9 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -40,7 +40,6 @@ #include "qframegraphnode.h" #include "qframegraphnode_p.h" #include <Qt3DRender/qframegraphnodecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/QNode> diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp index 8b0dd5669..5080012fd 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -40,9 +40,6 @@ #include "qlayerfilter.h" #include "qlayerfilter_p.h" #include "qlayer.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 4ef7e6d2d..778d3fa1f 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -42,9 +42,6 @@ #include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index d558a939e..8c2c6ee7f 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -41,9 +41,6 @@ #include "qrenderstateset_p.h" #include <Qt3DRender/qrenderstate.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 765aa1824..6584ff4fc 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -44,7 +44,6 @@ #include <QtGui/QScreen> #include <QtGui/QOffscreenSurface> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qrendersettings.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index f4d95d507..c997c23cc 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -40,7 +40,6 @@ #include "qrendertargetselector.h" #include "qrendertargetselector_p.h" #include <Qt3DRender/qrendertarget.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qrenderpass_p.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 28b151fc7..03e6a8ca7 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -41,9 +41,6 @@ #include "qtechniquefilter_p.h" #include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 539e02d65..34716c5b5 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -40,7 +40,6 @@ #include "qviewport.h" #include "qviewport_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qframegraphnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index afc49a563..bcec38fb6 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -42,9 +42,6 @@ #include "qrenderpassfilter.h" #include <Qt3DRender/private/qrenderpassfilter_p.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp index ed8a79eac..a1e639df5 100644 --- a/src/render/framegraph/rendersurfaceselector.cpp +++ b/src/render/framegraph/rendersurfaceselector.cpp @@ -40,7 +40,6 @@ #include "rendersurfaceselector_p.h" #include <Qt3DRender/qrendersurfaceselector.h> #include <Qt3DRender/private/qrendersurfaceselector_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtGui/qwindow.h> #include <QtGui/qscreen.h> diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index 871a00154..614a749a5 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -43,7 +43,6 @@ #include <Qt3DRender/qrendertargetselector.h> #include <Qt3DRender/private/qrendertargetselector_p.h> #include <Qt3DRender/qrendertarget.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/qrendertargetoutput.h> diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp index 3c7975945..5c61966c0 100644 --- a/src/render/framegraph/sortpolicy.cpp +++ b/src/render/framegraph/sortpolicy.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "sortpolicy_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qsortpolicy_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index 32ac5e569..c494c572b 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -43,9 +43,6 @@ #include <Qt3DRender/private/qrenderstateset_p.h> #include <Qt3DRender/private/genericstate_p.h> #include <Qt3DRender/private/renderstateset_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 8739143e6..b3b70e9cb 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -43,9 +43,6 @@ #include <Qt3DRender/private/qtechniquefilter_p.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index c37278817..5396d97e2 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -40,7 +40,6 @@ #include "viewportnode_p.h" #include <Qt3DRender/qviewport.h> #include <Qt3DRender/private/qviewport_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/waitfence.cpp b/src/render/framegraph/waitfence.cpp index 68ddda3d7..829730bbf 100644 --- a/src/render/framegraph/waitfence.cpp +++ b/src/render/framegraph/waitfence.cpp @@ -39,7 +39,6 @@ #include "waitfence_p.h" #include <Qt3DRender/private/qwaitfence_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> // // W A R N I N G diff --git a/src/render/frontend/qcameralens_p.h b/src/render/frontend/qcameralens_p.h index 01fcac0e5..5c5a6a42a 100644 --- a/src/render/frontend/qcameralens_p.h +++ b/src/render/frontend/qcameralens_p.h @@ -57,8 +57,6 @@ #include "qcameralens.h" -#include <Qt3DCore/qpropertyupdatedchange.h> - #include <QtGui/qmatrix4x4.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qcomputecommand.cpp b/src/render/frontend/qcomputecommand.cpp index b0bec42d4..d040150d5 100644 --- a/src/render/frontend/qcomputecommand.cpp +++ b/src/render/frontend/qcomputecommand.cpp @@ -39,7 +39,6 @@ #include "qcomputecommand.h" #include "qcomputecommand_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index 2a74db775..7269a8067 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -40,9 +40,6 @@ #include "qrendertarget.h" #include "qrendertarget_p.h" #include "qrendertargetoutput.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp index 14ac9c817..8c0d86134 100644 --- a/src/render/frontend/qrendertargetoutput.cpp +++ b/src/render/frontend/qrendertargetoutput.cpp @@ -40,7 +40,6 @@ #include "qrendertargetoutput.h" #include "qrendertargetoutput_p.h" #include "qtexture.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/armature.cpp b/src/render/geometry/armature.cpp index cfa2e572a..6e417952b 100644 --- a/src/render/geometry/armature.cpp +++ b/src/render/geometry/armature.cpp @@ -38,7 +38,6 @@ #include <Qt3DCore/qarmature.h> #include <Qt3DCore/qabstractskeleton.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/private/qarmature_p.h> diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index f241a85e5..de44c5fe3 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "attribute_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/private/qattribute_p.h> #include <Qt3DRender/private/stringtoint_p.h> diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index cb401df5b..56ea936be 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -42,8 +42,6 @@ #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/private/qgeometry_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <algorithm> diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index b5c741659..d885c4192 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -43,8 +43,6 @@ #include <Qt3DRender/private/qgeometryrenderer_p.h> #include <Qt3DRender/private/qmesh_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qtypedpropertyupdatechange_p.h> #include <Qt3DCore/private/qservicelocator_p.h> diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index a28d0baa6..84d14cfe1 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -41,8 +41,6 @@ #include "qattribute_p.h" #include <Qt3DRender/qbuffer.h> -#include <Qt3DCore/qpropertyupdatedchange.h> - QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index 47fad4302..4b0bca3b3 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -43,8 +43,6 @@ #include <private/qnode_p.h> #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index ddea873a7..5ffbb5e6f 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -41,9 +41,6 @@ #include "qgeometryrenderer_p.h" #include <private/qcomponent_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp index 30d71082b..3bdab0457 100644 --- a/src/render/lights/light.cpp +++ b/src/render/lights/light.cpp @@ -40,7 +40,6 @@ #include "light_p.h" #include "qabstractlight.h" #include "qabstractlight_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <private/abstractrenderer_p.h> #include <private/nodemanagers_p.h> #include <private/qbackendnode_p.h> diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index 9b6e580de..13fb78843 100644 --- a/src/render/lights/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp @@ -39,7 +39,6 @@ #include "qdirectionallight.h" #include "qdirectionallight_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp index c4deaf817..eddafbe61 100644 --- a/src/render/lights/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp @@ -40,7 +40,6 @@ #include "qspotlight.h" #include "qspotlight_p.h" #include "shaderdata_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 76036bd1f..035cf4746 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -43,10 +43,6 @@ #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qeffect_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> - #include <QVariant> #include <algorithm> diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index d51a06eec..e6c37b241 100644 --- a/src/render/materialsystem/filterkey.cpp +++ b/src/render/materialsystem/filterkey.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "filterkey_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qfilterkey_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 07764c207..6fda17ccd 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -46,10 +46,6 @@ #include "qeffect.h" #include <Qt3DRender/private/qmaterial_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> - using namespace Qt3DCore; QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index d32e60a2d..ad84c0413 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "parameter_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qparameter_p.h> #include <Qt3DRender/qtexture.h> diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index 35ac662fb..35f4d64a9 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -42,10 +42,6 @@ #include "qtechnique.h" #include "qparameter.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; @@ -172,7 +168,7 @@ QEffect::QEffect(QEffectPrivate &dd, QNode *parent) */ /*! - * Adds \a parameter to the effect. It sends a QPropertyNodeAddedChange to the backend. + * Adds \a parameter to the effect. It sends an update to the backend. * The \a parameter will be used to set a corresponding uniform value in the shader used * by this effect. */ @@ -219,7 +215,7 @@ QVector<QParameter *> QEffect::parameters() const } /*! - * Adds a new technique \a t to the effect. It sends a QPropertyNodeAddedChange to the backend. + * Adds a new technique \a t to the effect. It sends an update to the backend. */ void QEffect::addTechnique(QTechnique *t) { diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp index 547c56d26..dc968400b 100644 --- a/src/render/materialsystem/qfilterkey.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -40,7 +40,6 @@ #include "qfilterkey.h" #include "qfilterkey_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index db523a700..db286de6b 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -43,9 +43,6 @@ #include "qeffect.h" #include <Qt3DRender/private/renderlogging_p.h> #include "qparameter.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> /*! \qmltype Material diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index afaf42158..77eda8c8e 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -40,7 +40,6 @@ #include "qparameter.h" #include "qparameter_p.h" #include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qtexture.h> diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index d0821c49c..e9dd50325 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -43,9 +43,6 @@ #include "qparameter.h" #include "qfilterkey.h" #include "qrenderstate.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index dadeb98bd..1f7094632 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -41,9 +41,6 @@ #include "qtechnique_p.h" #include "qparameter.h" #include "qgraphicsapifilter.h" -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index aaeca3bb4..19e2a427e 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -48,10 +48,6 @@ #include <Qt3DRender/private/renderstates_p.h> #include <Qt3DRender/private/renderstateset_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> - #include <algorithm> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index b80a66a50..6116ca56b 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -39,6 +39,8 @@ #include "shaderbuilder_p.h" +#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DRender/private/qshaderprogrambuilder_p.h> #include <Qt3DRender/qshaderprogram.h> #include <Qt3DRender/private/qshaderprogram_p.h> diff --git a/src/render/materialsystem/shaderbuilder_p.h b/src/render/materialsystem/shaderbuilder_p.h index 12234bb6c..6b92d3114 100644 --- a/src/render/materialsystem/shaderbuilder_p.h +++ b/src/render/materialsystem/shaderbuilder_p.h @@ -53,7 +53,6 @@ #include <Qt3DRender/private/backendnode_p.h> #include <Qt3DRender/private/qgraphicsapifilter_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/shaderimage.cpp b/src/render/materialsystem/shaderimage.cpp index c1fb72bfd..65a4cf761 100644 --- a/src/render/materialsystem/shaderimage.cpp +++ b/src/render/materialsystem/shaderimage.cpp @@ -39,7 +39,6 @@ #include "shaderimage_p.h" #include <Qt3DRender/private/qshaderimage_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qabstracttexture.h> diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index d4199b7e3..10e9af990 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -48,9 +48,6 @@ #include <Qt3DRender/private/qtechnique_p.h> #include <Qt3DRender/private/shader_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/techniquemanager_p.h> #include <Qt3DRender/private/nodemanagers_p.h> diff --git a/src/render/picking/qraycaster.cpp b/src/render/picking/qraycaster.cpp index 27307d2a8..f32ea32f1 100644 --- a/src/render/picking/qraycaster.cpp +++ b/src/render/picking/qraycaster.cpp @@ -40,7 +40,6 @@ #include "qraycaster.h" #include "qabstractraycaster_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/private/qscene_p.h> diff --git a/src/render/picking/qscreenraycaster.cpp b/src/render/picking/qscreenraycaster.cpp index ef87632b4..3e47c2a01 100644 --- a/src/render/picking/qscreenraycaster.cpp +++ b/src/render/picking/qscreenraycaster.cpp @@ -40,7 +40,6 @@ #include "qscreenraycaster.h" #include "qabstractraycaster_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/private/qscene_p.h> diff --git a/src/render/picking/raycaster.cpp b/src/render/picking/raycaster.cpp index 34bbaefd9..fdf4eea26 100644 --- a/src/render/picking/raycaster.cpp +++ b/src/render/picking/raycaster.cpp @@ -45,8 +45,6 @@ #include <Qt3DRender/private/qabstractraycaster_p.h> #include <Qt3DRender/private/raycastingjob_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp index 11d2c2be9..1b5a972ec 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -54,9 +54,6 @@ #include <Qt3DRender/private/qabstracttexture_p.h> #include <Qt3DRender/private/renderbuffer_p.h> #include <Qt3DRender/private/qtextureimagedata_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #if !defined(QT_OPENGL_ES_2) #include <QOpenGLFunctions_3_1> diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp index ae77ced97..a449be508 100644 --- a/src/render/renderstates/qdithering.cpp +++ b/src/render/renderstates/qdithering.cpp @@ -41,7 +41,6 @@ #include "qdithering.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp index bb5136846..249dcd4bd 100644 --- a/src/render/renderstates/qmultisampleantialiasing.cpp +++ b/src/render/renderstates/qmultisampleantialiasing.cpp @@ -40,7 +40,6 @@ #include "qmultisampleantialiasing.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qnodepthmask.cpp b/src/render/renderstates/qnodepthmask.cpp index 7be7f24f4..241751a26 100644 --- a/src/render/renderstates/qnodepthmask.cpp +++ b/src/render/renderstates/qnodepthmask.cpp @@ -41,7 +41,6 @@ #include "qnodepthmask.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp index 860b36450..8458aded8 100644 --- a/src/render/renderstates/qseamlesscubemap.cpp +++ b/src/render/renderstates/qseamlesscubemap.cpp @@ -40,7 +40,6 @@ #include "qseamlesscubemap.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp index 86b4c706b..34f95c03d 100644 --- a/src/render/renderstates/qstenciloperation.cpp +++ b/src/render/renderstates/qstenciloperation.cpp @@ -40,7 +40,6 @@ #include "qstenciloperation.h" #include "qstenciloperation_p.h" #include "qstenciloperationarguments.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qrenderstatecreatedchange_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciltest.cpp b/src/render/renderstates/qstenciltest.cpp index 8f6738e54..7284af140 100644 --- a/src/render/renderstates/qstenciltest.cpp +++ b/src/render/renderstates/qstenciltest.cpp @@ -41,7 +41,6 @@ #include "qstenciltest.h" #include "qstenciltest_p.h" #include "qstenciltestarguments.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qrenderstatecreatedchange_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/renderstatenode.cpp b/src/render/renderstates/renderstatenode.cpp index bd218c803..3040c5aaa 100644 --- a/src/render/renderstates/renderstatenode.cpp +++ b/src/render/renderstates/renderstatenode.cpp @@ -37,7 +37,6 @@ #include "renderstatenode_p.h" #include <Qt3DRender/qrenderstate.h> #include <Qt3DRender/private/qrenderstatecreatedchange_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qalphacoverage.h> #include <Qt3DRender/qalphatest.h> diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index bd4a209a1..5e238c010 100644 --- a/src/render/renderstates/renderstates.cpp +++ b/src/render/renderstates/renderstates.cpp @@ -40,7 +40,6 @@ #include "renderstates_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qrenderstate.h> #include <Qt3DRender/qcullface.h> #include <Qt3DRender/qpointsize.h> diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index a5d342d83..9ca4599c5 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -39,7 +39,6 @@ #include "qabstracttextureimage.h" #include "qabstracttextureimage_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qtextureimagedatagenerator.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 512949d91..25001b9df 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "textureimage_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qtextureimage.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/qabstracttextureimage_p.h> |