summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qcombobox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
-rw-r--r--src/widgets/widgets/qcombobox.cpp11
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)