diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-27 13:01:29 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-27 13:01:29 (GMT) |
| commit | 016b89d07478c91617ad345a0b3d7f16d0f8cd21 (patch) | |
| tree | b56f2a81e112d08cc6d629ea2e6e1e4259b56f35 /src/gui/kernel/qwidget.cpp | |
| parent | 4459b4b29073bb82fe480b5eac1a4d9241068b38 (diff) | |
| parent | 103e1e8ea5e8879f2bb97e008840a212b3004a51 (diff) | |
| download | Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.zip Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.tar.gz Qt-016b89d07478c91617ad345a0b3d7f16d0f8cd21.tar.bz2 | |
Merge commit 'origin/4.7' into symbian47
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index e56ba7b..b5879ae 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -317,6 +317,8 @@ QInputContext *QWidget::inputContext() This function sets the input context \a context on this widget. + Qt takes ownership of the given input \a context. + \sa inputContext() */ void QWidget::setInputContext(QInputContext *context) @@ -325,6 +327,8 @@ void QWidget::setInputContext(QInputContext *context) if (!testAttribute(Qt::WA_InputMethodEnabled)) return; #ifndef QT_NO_IM + if (context == d->ic) + return; if (d->ic) delete d->ic; d->ic = context; @@ -675,8 +679,8 @@ void QWidget::setAutoFillBackground(bool enabled) (to move the keyboard focus), and passes on most of the other events to one of the more specialized handlers above. - Events and the mechanism used to deliver them are covered in the - \l{Events and Event Filters} document. + Events and the mechanism used to deliver them are covered in + \l{The Event System}. \section1 Groups of Functions and Properties |