diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 07:06:17 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 07:06:17 (GMT) |
| commit | 75fc8ab96ee142ade5362eeaa94ce7e47ebcb579 (patch) | |
| tree | 36a8c57866582eeff875615c0aeb1a0f148ba1c3 /src/gui/kernel/qwidget.cpp | |
| parent | 93ea4a9cd6336de6e2a63b1ca075a7fdb835cfa7 (diff) | |
| parent | 23ae8b6badfd688f962590268a6147771d27266c (diff) | |
| download | Qt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.zip Qt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.tar.gz Qt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 955ac8b..b376f20 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -5825,8 +5825,9 @@ void QWidget::setFocus(Qt::FocusReason reason) void QWidget::clearFocus() { QWidget *w = this; - while (w && w->d_func()->focus_child == this) { - w->d_func()->focus_child = 0; + while (w) { + if (w->d_func()->focus_child == this) + w->d_func()->focus_child = 0; w = w->parentWidget(); } #ifndef QT_NO_GRAPHICSVIEW |