diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 00:54:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 00:54:58 (GMT) |
| commit | d28ca0cfc3d26b5cd4c48ce027063a27347e1b12 (patch) | |
| tree | c1ca40203895824bc0c1a69abceadcec7a7ee30e | |
| parent | 213b5d2651aaf55e76b3aab3788ab86a08a75b82 (diff) | |
| parent | 67405c1b4d8ae5b47191ff1c28606453bf52295c (diff) | |
| download | Qt-d28ca0cfc3d26b5cd4c48ce027063a27347e1b12.zip Qt-d28ca0cfc3d26b5cd4c48ce027063a27347e1b12.tar.gz Qt-d28ca0cfc3d26b5cd4c48ce027063a27347e1b12.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Stop focus propagation of touch events when flag is set.
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index a61b569..f997fc2 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -5936,6 +5936,8 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve } if (item->isPanel()) break; + if (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation) + break; } // If nobody could take focus, clear it. @@ -5968,6 +5970,8 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve } if (item && item->isPanel()) break; + if (item && (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation)) + break; } touchEvent->setAccepted(eventAccepted); |