From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 27 Apr 2011 03:27:13 +0000 (+1000)
Subject: Pre-accept events
X-Git-Tag: qt-v5.0.0-alpha1~2170^2~179
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f837a2885465a2381f6cda137fefec34d44fa132;p=profile%2Fivi%2Fqtdeclarative.git

Pre-accept events

Key handler expects events to be accepted, and will ignore them if
necessary.

Change-Id: I8ee110d70c98ff7c2de107b44e7d51aab12678c4
Reviewed-by: Michael Brasser
(cherry picked from commit 6476bbea1d7905f083789224accc8f4b43a0779b)
---

diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index a325f0d..5fc5c76 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -1521,6 +1521,7 @@ bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
     switch (e->type()) {
     case QEvent::KeyPress:
     case QEvent::KeyRelease:
+        e->accept();
         QSGItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e));
         while (!e->isAccepted() && (item = item->parentItem())) {
             e->accept();
@@ -1528,6 +1529,7 @@ bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
         }
         break;
     case QEvent::InputMethod:
+        e->accept();
         QSGItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e));
         while (!e->isAccepted() && (item = item->parentItem())) {
             e->accept();