aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgcanvas.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-04-27 13:27:13 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-04-28 09:52:47 +1000
commitf837a2885465a2381f6cda137fefec34d44fa132 (patch)
treeac934ecd0f3b0b5264023be5df2856e460d74ea2 /src/declarative/items/qsgcanvas.cpp
parent31dd5d55dd79318512e9efc13cb447553accd32d (diff)
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)
Diffstat (limited to 'src/declarative/items/qsgcanvas.cpp')
-rw-r--r--src/declarative/items/qsgcanvas.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index a325f0dac1..5fc5c76d1d 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();