diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-06-12 12:25:55 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-06-12 12:25:55 (GMT) |
| commit | 98fb861cf4611f9cada3d80ef93647669dfad165 (patch) | |
| tree | 11a5eb7106300aa0caf84447cbac6fc6b40b2974 /src/gui/kernel/qwidget.cpp | |
| parent | d5c16071ac414e4dd40d8742403b675b2cdefa55 (diff) | |
| parent | 304bf2ef0a99882d2d969347f85a330523086fb3 (diff) | |
| download | Qt-98fb861cf4611f9cada3d80ef93647669dfad165.zip Qt-98fb861cf4611f9cada3d80ef93647669dfad165.tar.gz Qt-98fb861cf4611f9cada3d80ef93647669dfad165.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index baf3278..ae00d65 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -5687,8 +5687,8 @@ bool QWidget::hasFocus() const called from focusOutEvent() or focusInEvent(), you may get an infinite recursion. - \sa hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(), - setFocusPolicy(), QApplication::focusWidget(), grabKeyboard(), + \sa focus(), hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(), + setFocusPolicy(), focusWidget(), QApplication::focusWidget(), grabKeyboard(), grabMouse(), {Keyboard Focus} */ |