diff options
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch deleted file mode 100644 index 79a48f54..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge <shawn.rutledge@qt.io> -Date: Wed, 1 Feb 2017 12:06:26 +0100 -Subject: [PATCH 3/3] fix memory leak in - QQuickWindowPrivate::deliverTouchAsMouse -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A QTouchEvent is allocated with a reduced subset of TouchPoints for -each Item to which we attempt to deliver it, and thrown away afterwards. -(Ιt's not efficient to heap-allocate it, but we can't avoid doing it -at all without changing behavior.) So now it's stored in a QScopedPointer. - -Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b -Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/quick/items/qquickwindow.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp -index 1297dde..c130aec 100644 ---- a/src/quick/items/qquickwindow.cpp -+++ b/src/quick/items/qquickwindow.cpp -@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - - // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here. - Q_ASSERT(pointerEvent->asPointerTouchEvent()); -- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item); -- if (!event) -+ QScopedPointer<QTouchEvent> event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item)); -+ if (event.isNull()) - return false; - - // For each point, check if it is accepted, if not, try the next point. -@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - break; - - qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; -- QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); -+ QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false)); - - // Send a single press and see if that's accepted - QCoreApplication::sendEvent(item, mousePress.data()); -@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - pointerEventPoint->setGrabber(item); - - if (checkIfDoubleClicked(event->timestamp())) { -- QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); -+ QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false)); - QCoreApplication::sendEvent(item, mouseDoubleClick.data()); - event->setAccepted(mouseDoubleClick->isAccepted()); - if (!mouseDoubleClick->isAccepted()) { -@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (touchMouseDevice == device && p.id() == touchMouseId) { - if (p.state() & Qt::TouchPointMoved) { - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - event->setAccepted(me->isAccepted()); - if (me->isAccepted()) { -@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - // no grabber, check if we care about mouse hover - // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now. - // hover for touch??? -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false)); - if (lastMousePosition.isNull()) - lastMousePosition = me->windowPos(); - QPointF last = lastMousePosition; -@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (p.state() & Qt::TouchPointReleased) { - // currently handled point was released - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - - if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) { --- -2.9.3 - |