aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorJoni Poikelin <joni.poikelin@digia.com>2014-06-09 14:50:29 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-11 17:47:23 +0200
commite897eec27d3e9322e2048db3afae651a79578e85 (patch)
tree543da3becfeaeaf83180218df33651c60836a4f1 /src/quick
parentb4247d7c79af564b1213a9de17ff306747e17caa (diff)
Fix forwarding of keyboard events to multiple target items
Fix regression when multiple items are set to Keys.forwardTo attached property. QML items accept key events automatically and event should be by default in accepted state when entering handler. Task-number: QTBUG-39168 Change-Id: Ibf6c163c4059269996113634efa48ad2fe4d838d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickitem.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index ef2eac4b61..442080a335 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1333,6 +1333,7 @@ void QQuickKeysAttached::keyPressed(QKeyEvent *event, bool post)
for (int ii = 0; ii < d->targets.count(); ++ii) {
QQuickItem *i = d->targets.at(ii);
if (i && i->isVisible()) {
+ event->accept();
QCoreApplication::sendEvent(i, event);
if (event->isAccepted()) {
d->inPress = false;
@@ -1375,6 +1376,7 @@ void QQuickKeysAttached::keyReleased(QKeyEvent *event, bool post)
for (int ii = 0; ii < d->targets.count(); ++ii) {
QQuickItem *i = d->targets.at(ii);
if (i && i->isVisible()) {
+ event->accept();
QCoreApplication::sendEvent(i, event);
if (event->isAccepted()) {
d->inRelease = false;