Merge branch '5.6' into 5.7

Conflicts:
	examples/qt3d/examples-common/qorbitcontrol.h
	src/core/qnodecreatedchange.cpp
	src/core/qnodecreatedchange.h
	src/input/frontend/qaxisactionhandler.h
	src/input/frontend/qinputaspect.h
	src/input/frontend/qkeyboardhandler.h
	src/input/frontend/qmousedevice.h
	src/input/frontend/qmousehandler.h
	src/input/frontend/qphysicaldevicecreatedchange.h
	src/input/input.pro
	src/logic/qframeaction.h
	src/plugins/sceneparsers/assimp/assimp.pro
	src/quick3d/imports/input/importsinput.pro
	src/quick3d/imports/render/importsrender.pro
	src/render/backend/trianglesextractor.cpp
	src/render/framegraph/qclearbuffer.h
	src/render/framegraph/qlighting.h
	src/render/framegraph/qstateset.h
	src/render/frontend/qrenderattachment.h
	src/render/geometry/qabstractattribute.h
	src/render/geometry/qabstractbuffer.h
	src/render/geometry/qattribute.h
	src/render/geometry/qboundingvolumespecifier.h
	src/render/geometry/qbuffer.h
	src/render/materialsystem/qfilterkey.h
	src/render/materialsystem/qparameter.h
	src/render/materialsystem/qparametermapping.h
	src/render/renderstates/qblendstate.h
	src/render/renderstates/qdepthmask.h
	src/render/renderstates/qpointsize.cpp
	src/render/renderstates/qrenderstatecreatedchange.cpp
	src/render/renderstates/qstencilop.h
	src/render/renderstates/qstencilopseparate.h
	src/render/renderstates/qstenciltestseparate.h
	src/render/texture/qabstracttexture.h
	src/render/texture/qabstracttextureimage.h
	src/render/texture/qtextureproviders.h

Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4

1 files changed, 6 insertions, 6 deletions

diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index ca8acb665..3396411d8 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -269,13 +269,13 @@ void QObjectPickerPrivate::propagateEvent(QPickEvent *event, EventType type)
                 if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != Q_NULLPTR) {
                     QObjectPickerPrivate *objectPickerPrivate = static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(objectPicker));
                     switch (type) {
-                    case EventType::Pressed:
+                    case Pressed:
                         objectPickerPrivate->pressedEvent(event);
                         break;
-                    case EventType::Released:
+                    case Released:
                         objectPickerPrivate->releasedEvent(event);
                         break;
-                    case EventType::Clicked:
+                    case Clicked:
                         objectPickerPrivate->clickedEvent(event);
                         break;
                     case EventType::Moved:
@@ -301,7 +301,7 @@ void QObjectPickerPrivate::pressedEvent(QPickEvent *event)
     m_acceptedLastPressedEvent = event->isAccepted();
     if (!m_acceptedLastPressedEvent) {
         // Travel parents to transmit the event
-        propagateEvent(event, EventType::Pressed);
+        propagateEvent(event, Pressed);
     } else {
         setPressed(true);
     }
@@ -315,7 +315,7 @@ void QObjectPickerPrivate::clickedEvent(QPickEvent *event)
     Q_Q(QObjectPicker);
     emit q->clicked(event);
     if (!event->isAccepted())
-        propagateEvent(event, EventType::Clicked);
+        propagateEvent(event, Clicked);
 }
 
 /*!
@@ -340,7 +340,7 @@ void QObjectPickerPrivate::releasedEvent(QPickEvent *event)
         setPressed(false);
     } else {
         event->setAccepted(false);
-        propagateEvent(event, EventType::Released);
+        propagateEvent(event, Released);
     }
 }