summaryrefslogtreecommitdiffstats
path: root/src/render/picking/qobjectpicker.cpp
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2017-02-28 18:09:26 +0200
committerAntti Määttä <antti.maatta@qt.io>2017-03-15 07:59:37 +0000
commit9f94d7517c3060d29682f84ca31005ecacf32447 (patch)
tree0339eaa78b22a7817fb9f9ded60004428ce9f72b /src/render/picking/qobjectpicker.cpp
parent70bfbe58d2de2dfd6a3aadf0bec3b5e09ed5dc80 (diff)
Cleanup scene2d - remove event forward
Remove event forward related stuff as they are no longer necessary after the mouse event changes. Task-number: QTBUG-58876 Change-Id: I2c9c52e41d5af3078d04ac9d5cc66753898e0ad9 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/picking/qobjectpicker.cpp')
-rw-r--r--src/render/picking/qobjectpicker.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 45f7ff135..49f608a67 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -43,7 +43,6 @@
#include <Qt3DCore/private/qcomponent_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DRender/qpickevent.h>
-#include <Qt3DRender/qeventforward.h>
QT_BEGIN_NAMESPACE
@@ -238,37 +237,6 @@ void QObjectPicker::setDragEnabled(bool dragEnabled)
}
/*!
- \qmlproperty EventForward Qt3D.Render::ObjectPicker::eventForward
- Holds the EventForward type.
-*/
-/*!
- \property Qt3DRender::QObjectPicker::eventForward
- Holds the EventForward type.
- */
-QEventForward *QObjectPicker::eventForward() const
-{
- Q_D(const QObjectPicker);
- return d->m_eventForward;
-}
-
-void QObjectPicker::setEventForward(QEventForward *eventForward)
-{
- Q_D(QObjectPicker);
- if (d->m_eventForward != eventForward) {
- if (d->m_eventForward)
- d->unregisterDestructionHelper(d->m_eventForward);
- d->m_eventForward = eventForward;
- if (eventForward) {
- if (eventForward->parent() == nullptr)
- eventForward->setParent(this);
- d->registerDestructionHelper(eventForward, &QObjectPicker::setEventForward,
- d->m_eventForward);
- }
- emit eventForwardChanged(eventForward);
- }
-}
-
-/*!
\qmlproperty bool Qt3D.Render::ObjectPicker::dragEnabled
*/
/*!
@@ -468,7 +436,6 @@ Qt3DCore::QNodeCreatedChangeBasePtr QObjectPicker::createNodeCreationChange() co
Q_D(const QObjectPicker);
data.hoverEnabled = d->m_hoverEnabled;
data.dragEnabled = d->m_dragEnabled;
- data.eventForward = Qt3DCore::qIdForNode(d->m_eventForward);
return creationChange;
}