Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	tests/auto/quick/qquicktextedit/BLACKLIST

Change-Id: If1868d27ea40fdc206971c2f7a24e91c5e62b1bf

1 files changed, 8 insertions, 0 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 22b8877b9f..e491369d44 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -1759,6 +1759,8 @@ bool QQuickSinglePointEvent::hasExclusiveGrabber(const QQuickPointerHandler *han
 
 bool QQuickPointerMouseEvent::isPressEvent() const
 {
+    if (!m_event)
+        return false;
     auto me = static_cast<QMouseEvent*>(m_event);
     return ((me->type() == QEvent::MouseButtonPress || me->type() == QEvent::MouseButtonDblClick) &&
             (me->buttons() & me->button()) == me->buttons());
@@ -1766,18 +1768,24 @@ bool QQuickPointerMouseEvent::isPressEvent() const
 
 bool QQuickPointerMouseEvent::isDoubleClickEvent() const
 {
+    if (!m_event)
+        return false;
     auto me = static_cast<QMouseEvent*>(m_event);
     return (me->type() == QEvent::MouseButtonDblClick);
 }
 
 bool QQuickPointerMouseEvent::isUpdateEvent() const
 {
+    if (!m_event)
+        return false;
     auto me = static_cast<QMouseEvent*>(m_event);
     return me->type() == QEvent::MouseMove;
 }
 
 bool QQuickPointerMouseEvent::isReleaseEvent() const
 {
+    if (!m_event)
+        return false;
     auto me = static_cast<QMouseEvent*>(m_event);
     return me && me->type() == QEvent::MouseButtonRelease;
 }