diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-08-27 11:15:05 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-08-27 11:15:05 (GMT) |
| commit | 287001fcd6d854b58bd61412e8b2c5bbdcb67b05 (patch) | |
| tree | d78b4f109c9cce328dc5627de334f96b79331046 /src/gui/kernel/qgesturemanager.cpp | |
| parent | 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc (diff) | |
| parent | 8cb399e2c2ba47cdf3b27c7c5cb4d8d35702a068 (diff) | |
| download | Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.zip Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.gz Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/gui/kernel/qgesturemanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp index e768a21..cb4061e 100644 --- a/src/gui/kernel/qgesturemanager.cpp +++ b/src/gui/kernel/qgesturemanager.cpp @@ -595,8 +595,9 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures, if (gesture->hasHotSpot()) { // guess the target widget using the hotspot of the gesture QPoint pt = gesture->hotSpot().toPoint(); - if (QWidget *w = qApp->topLevelAt(pt)) { - target = w->childAt(w->mapFromGlobal(pt)); + if (QWidget *topLevel = qApp->topLevelAt(pt)) { + QWidget *child = topLevel->childAt(topLevel->mapFromGlobal(pt)); + target = child ? child : topLevel; } } else { // or use the context of the gesture |