diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-10 01:01:21 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-10 09:35:18 +0200 |
| commit | 35f59635087a36e5037a9590ce0b0da0b138c488 (patch) | |
| tree | 51e56fefa3b13fe69d290473f19e86cad3ef8ba6 /src/quick/items | |
| parent | 96c4fffd8648e9c9fb95e8208a76933c8c2120bc (diff) | |
| parent | 8c3172d724f3ad03cdee7bae23443fa109d350b1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
src/qml/types/qqmlmodelsmodule.cpp
Change-Id: Idc63689ba98d83a455283674f4b5cf3014473605
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickrectangle_p_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h index c7c5293f9b..f40e5adada 100644 --- a/src/quick/items/qquickrectangle_p_p.h +++ b/src/quick/items/qquickrectangle_p_p.h @@ -64,7 +64,7 @@ class QQuickRectanglePrivate : public QQuickItemPrivate public: QQuickRectanglePrivate() : - color(Qt::white), gradient(0), pen(0), radius(0) + color(Qt::white), gradient(QJSValue::UndefinedValue), pen(0), radius(0) { } diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index d448d74b99..88d419e2b3 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2025,8 +2025,8 @@ bool QQuickWindowPrivate::deliverTouchCancelEvent(QTouchEvent *event) qCDebug(DBG_TOUCH) << event; Q_Q(QQuickWindow); - if (q->mouseGrabberItem()) - q->mouseGrabberItem()->ungrabMouse(); + if (QQuickItem *grabber = q->mouseGrabberItem()) + sendUngrabEvent(grabber, true); cancelTouchMouseSynthesis(); // A TouchCancel event will typically not contain any points. |