diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-09-27 14:36:56 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 14:02:08 +0200 |
| commit | 50f0aeee770d4e23bb7466c6b5128f5d7dfe4590 (patch) | |
| tree | 42f799c7d08f16581b8fd14ac9977ead5c7e8a33 /src/widgets/widgets/qcombobox.cpp | |
| parent | 3d71266fea91628d28ae4e55cd105a0bd5d8b457 (diff) | |
Adapted most QInputContext usage on widgets to QInputPanel
Including most of stuff excluding mouse event handling
which differs between the classes.
Change-Id: Iff1e56b9c50c3f84de2d1c43a3416a1952197a17
Reviewed-on: http://codereview.qt-project.org/5640
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index f6a9b53b8d..a29c8abe2c 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -57,9 +57,6 @@ #include <qtreeview.h> #include <qheaderview.h> #include <qmath.h> -#ifndef QT_NO_IM -#include "qinputcontext.h" -#endif #include <private/qapplication_p.h> #include <private/qcombobox_p.h> #include <private/qabstractitemmodel_p.h> @@ -2489,10 +2486,10 @@ void QComboBox::showPopup() listRect.moveBottomLeft(above); } -#ifndef QT_NO_IM - if (QInputContext *qic = inputContext()) - qic->reset(); -#endif + if (qApp) { + qApp->inputPanel()->reset(); + } + QScrollBar *sb = view()->horizontalScrollBar(); Qt::ScrollBarPolicy policy = view()->horizontalScrollBarPolicy(); bool needHorizontalScrollBar = (policy == Qt::ScrollBarAsNeeded || policy == Qt::ScrollBarAlwaysOn) |