From 7b49a23888c2463d9ac23e4f0006e547ad16ae07 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 9 Aug 2011 14:23:50 +1000 Subject: 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 Reviewed-by: Michael Brasser --- src/gui/graphicsview/qgraphicsitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.3