diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-09 14:23:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-15 10:00:37 +0200 |
| commit | 7b49a23888c2463d9ac23e4f0006e547ad16ae07 (patch) | |
| tree | 59b733114c3111b89cac39868716a7071366b947 /src | |
| parent | 81b559631a4f3ece66196965d034684d506af70d (diff) | |
Don't endless loop
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
(cherry picked from commit ce36e8afa47e3625737208b5a912f9f191a59678)
Change-Id: Iaaaabadbabaaaeaaaaaaaaffaaaeaaaaaaaacaaa
Reviewed-on: http://codereview.qt.nokia.com/2757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index ef539634d9..2ac2bdf6ee 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3297,7 +3297,7 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim } if (climb) { - while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible()) + while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible() && f->d_ptr->focusScopeItem != f) f = f->d_ptr->focusScopeItem; } |