aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-05 09:36:31 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-06 08:11:11 +0000
commitb59e605b4d2f3c17b8bee0322ba156f990403d2d (patch)
treeb22b10a2247f5bd019bbbc670eb27a6864ac71cf
parent2647ea9481032f4e3dee295f5f6207ad1a96a876 (diff)
QQuickWindow: Replace assert() on unreleased touch points by warning.
Output a warning message and clear QQuickWindowPrivate::itemForTouchPointId should unreleased touch points exist when QEvent::TouchEnd is received. Task-number: QTBUG-45856 Change-Id: I8a05220e4258c0ca401f79a2c32ec4f1d43fa444 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/quick/items/qquickwindow.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index bccebb1a14..0b1c79567f 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1989,7 +1989,12 @@ void QQuickWindowPrivate::reallyDeliverTouchEvent(QTouchEvent *event)
}
if (event->type() == QEvent::TouchEnd) {
- Q_ASSERT(itemForTouchPointId.isEmpty());
+ if (!itemForTouchPointId.isEmpty()) {
+ qWarning() << "No release received for" << itemForTouchPointId.size()
+ << "touch points over" << itemForTouchPointId.begin().value()
+ << "on touch end.";
+ itemForTouchPointId.clear();
+ }
}
--touchRecursionGuard;