diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-10-06 17:04:07 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-11 16:01:57 +0200 |
| commit | 76ca6642a9ddb5ffe21691918a4a803760f0f487 (patch) | |
| tree | ee8e0abb2b932e616e2198df8aac87610587a809 /src/widgets/kernel/qwidget.cpp | |
| parent | e5ce564b1d2f2818c36ffbabbaa558c091512e66 (diff) | |
Removed obsolete custom input context support
Removed from QWidgetPrivate and QWidgetTextControl. Now using only
application specific input context.
Change-Id: Id25882e72026f58dab51a18e5d04a11225429963
Reviewed-on: http://codereview.qt-project.org/6427
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 7f19f2b22c3..3012eab777e 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -372,15 +372,6 @@ void QWidgetPrivate::updateWidgetTransform() } } -QInputContext *QWidgetPrivate::inputContext() const -{ -#ifndef QT_NO_IM - return qApp->inputContext(); -#else - return 0; -#endif -} - /*! This function returns the QInputContext for this widget. By default the input context is inherited from the widgets @@ -397,7 +388,7 @@ QInputContext *QWidget::inputContext() if (!testAttribute(Qt::WA_InputMethodEnabled)) return 0; - return d->inputContext(); + return qApp->inputContext(); } #ifdef QT_KEYPAD_NAVIGATION |