diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
commit | f57eaeb3c46a375113e5d5ebaf0c2cb289795606 (patch) | |
tree | 70dc33f63d7b1ea3adb9eeecf67b8d05fdd66270 /src/gui/kernel/qwidget.cpp | |
parent | 4a58e7f64e5922e7815a98244c4b8dda1689ff26 (diff) | |
parent | 831e286f811c0e0238f3dd061ae41782f8637a16 (diff) | |
download | Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.zip Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.gz Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoawindow_mac.mm
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index da3ef92..06d52ae 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -366,7 +366,8 @@ bool QWidget::hasEditFocus() const normally; otherwise, Qt::Key_Up and Qt::Key_Down are used to change focus. - This feature is only available in Qt for Embedded Linux. + This feature is only available in Qt for Embedded Linux and Qt + for Symbian. \sa hasEditFocus(), QApplication::keypadNavigationEnabled() */ @@ -6045,6 +6046,11 @@ bool QWidget::hasFocus() const (Nothing happens if the focus in and focus out widgets are the same.) + \note On embedded platforms, setFocus() will not cause an input panel + to be opened by the input method. If you want this to happen, you + have to send a QEvent::RequestSoftwareInputPanel event to the + widget yourself. + setFocus() gives focus to a widget regardless of its focus policy, but does not clear any keyboard grab (see grabKeyboard()). @@ -6057,7 +6063,7 @@ bool QWidget::hasFocus() const \sa hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(), setFocusPolicy(), focusWidget(), QApplication::focusWidget(), grabKeyboard(), - grabMouse(), {Keyboard Focus} + grabMouse(), {Keyboard Focus}, QEvent::RequestSoftwareInputPanel */ void QWidget::setFocus(Qt::FocusReason reason) |