Merge branch 'wip/qtquickintegration' into dev

 Conflicts:
	src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
	src/render/backend/triangleboundingvolume.cpp
	src/render/backend/triangleboundingvolume_p.h
	src/render/frontend/qrenderaspect.cpp
	src/render/frontend/sphere.cpp
	src/render/frontend/sphere_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/pickboundingvolumejob_p.h
	src/render/picking/objectpicker.cpp
	src/render/raycasting/qcollisionqueryresult_p.h
	src/render/render.pro
	src/src.pro
	tests/auto/render/objectpicker/tst_objectpicker.cpp
	tests/auto/render/render.pro

Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp
index c1b06ccd8..4ba57b0ad 100644
--- a/tests/auto/render/objectpicker/tst_objectpicker.cpp
+++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp
@@ -46,7 +46,9 @@ private Q_SLOTS:
         // GIVEN
         Qt3DRender::Render::ObjectPicker objectPicker;
         Qt3DRender::QObjectPicker picker;
+        Qt3DRender::QEventForward eventForward;
         picker.setHoverEnabled(true);
+        picker.setEventForward(&eventForward);
 
         // WHEN
         simulateInitialization(&picker, &objectPicker);
@@ -54,6 +56,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(!objectPicker.peerId().isNull());
         QCOMPARE(objectPicker.isHoverEnabled(), true);
+        QCOMPARE(objectPicker.eventForward(), eventForward.id());
     }
 
     void checkInitialAndCleanedUpState()
@@ -64,6 +67,8 @@ private Q_SLOTS:
         // THEN
         QVERIFY(objectPicker.peerId().isNull());
         QCOMPARE(objectPicker.isHoverEnabled(), false);
+        QCOMPARE(objectPicker.isEventForwardingEnabled(), false);
+        QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId());
 
         // GIVEN
         Qt3DRender::QObjectPicker picker;
@@ -75,6 +80,8 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(objectPicker.isHoverEnabled(), false);
+        QCOMPARE(objectPicker.isEventForwardingEnabled(), false);
+        QCOMPARE(objectPicker.eventForward(), Qt3DCore::QNodeId());
     }
 
     void checkPropertyChanges()
@@ -83,6 +90,7 @@ private Q_SLOTS:
         TestRenderer renderer;
         {
             Qt3DRender::Render::ObjectPicker objectPicker;
+            Qt3DRender::QEventForward eventForward;
             objectPicker.setRenderer(&renderer);
 
             // WHEN
@@ -94,6 +102,15 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(objectPicker.isHoverEnabled(), true);
             QVERIFY(renderer.dirtyBits() != 0);
+
+            // WHEN
+            updateChange->setValue(QVariant::fromValue(eventForward.id()));
+            updateChange->setPropertyName("eventForward");
+            objectPicker.sceneChangeEvent(updateChange);
+
+            // THEN
+            QCOMPARE(objectPicker.isEventForwardingEnabled(), true);
+            QCOMPARE(objectPicker.eventForward(), eventForward.id());
         }
     }