diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
| commit | 79aee2c16479a1dff1af886a6ccc6b2776ad6537 (patch) | |
| tree | 3a303a9f7a125f9f2f04f04711d3f9a69168a481 /src/gui/kernel | |
| parent | 3868e92de3b27f3e030b77cfa746888a0dbb39e7 (diff) | |
| parent | 21cfe5bf6550ae359d6bfa937b1308891954e9bb (diff) | |
| download | Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.zip Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.gz Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 08fe5b9..e2de148 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11454,6 +11454,10 @@ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction) QWidget *targetWidget = 0; int shortestDistance = INT_MAX; foreach(QWidget *targetCandidate, QApplication::allWidgets()) { + + if (targetCandidate->focusProxy()) //skip if focus proxy set + continue; + const QRect targetCandidateRect = targetCandidate->rect().translated(targetCandidate->mapToGlobal(QPoint())); if ( targetCandidate != sourceWidget && targetCandidate->focusPolicy() & Qt::TabFocus |