summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-06-16 11:20:15 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-06-16 11:20:15 (GMT)
commitc41591d57377cd7c520efc93d9c087ad34d2bb6f (patch)
tree975a8573da68b3f9bd169ecf607f7492f723a003 /src/gui/kernel/qwidget.cpp
parent1e6b142fa2833f55972d6d4aa7dde0bb215c2f25 (diff)
parentacc764552c552df31719af561e285886085371e9 (diff)
downloadQt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.zip
Qt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.tar.gz
Qt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index db73c07..eed873a 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5635,7 +5635,7 @@ bool QWidget::hasFocus() const
called from focusOutEvent() or focusInEvent(), you may get an
infinite recursion.
- \sa focus(), hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(),
+ \sa hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(),
setFocusPolicy(), focusWidget(), QApplication::focusWidget(), grabKeyboard(),
grabMouse(), {Keyboard Focus}
*/