diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-03 21:52:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-03 21:52:20 +0100 |
| commit | 2c6b04420c9aec4dc65c2492ae49e3ebca10027c (patch) | |
| tree | 893f0736d3ce378426f072abfc7f4737dd0743e1 /src/quick/items/qquickevents.cpp | |
| parent | 789929f939a60462373beae37ab4373809095cff (diff) | |
| parent | bda38eae465fdf7dc719966e1199eafc7eb7c27c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/common/qv4compileddata_p.h
tests/auto/qml/qmlmin/tst_qmlmin.cpp
Change-Id: Ieabc9e0729630de6a8644024d11b765f35199f29
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 03280e4c1f..469dc3cb4d 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -1626,6 +1626,8 @@ bool QQuickSinglePointEvent::allPointsGrabbed() const QMouseEvent *QQuickPointerMouseEvent::asMouseEvent(const QPointF &localPos) const { + if (!m_event) + return nullptr; auto event = static_cast<QMouseEvent *>(m_event); event->setLocalPos(localPos); return event; |