diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-28 11:46:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-28 17:47:08 +0000 |
| commit | c359011dc53cf8c1c45dd86299b877c5e33ac740 (patch) | |
| tree | da08d0dfa3b4ee78f98968931d8fdde37ceccbef /src/widgets | |
| parent | a6b34517ecf458d5c09fe4a1e6cf53811be7bd66 (diff) | |
Fix building with QT_NO_IM
Change-Id: Ibb5248d6392f6746dcdf398361bd38f9e98a7eb7
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 89fd3d3d57..261a6ec2de 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1765,7 +1765,9 @@ void QComboBox::setLineEdit(QLineEdit *edit) delete d->lineEdit; d->lineEdit = edit; +#ifndef QT_NO_IM qt_widget_private(d->lineEdit)->inheritsInputMethodHints = 1; +#endif if (d->lineEdit->parent() != this) d->lineEdit->setParent(this); connect(d->lineEdit, SIGNAL(returnPressed()), this, SLOT(_q_returnPressed())); |