Add QEventForward to QObjectPicker

Change-Id: I3a1a7ffdf2c5ec765e9f9e10ed5f15e3902ae15d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 33 insertions, 0 deletions

diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 1842b7fee..9fa8b774c 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -43,6 +43,7 @@
 #include <Qt3DCore/private/qcomponent_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DRender/qpickevent.h>
+#include <Qt3DRender/qeventforward.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -203,6 +204,37 @@ 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
 */
 /*!
@@ -402,6 +434,7 @@ 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;
 }