diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-08 10:15:22 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-08 11:36:27 +0000 |
| commit | c0713254c7492d6c146ae8cdbc0e98bcd4e698f1 (patch) | |
| tree | f2a6f5d578d99915a1e69419bd36a1a4ac29113b /src | |
| parent | 2519e7f23ae05c46e570025a756f6fdb851c56c6 (diff) | |
Build fix for -no-feature-im
Change-Id: I5cd37b78c18847c9535584d0452c8214873db5f2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 4 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickcombobox_p.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 3aabd238..95980e6b 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1337,10 +1337,12 @@ bool QQuickComboBox::eventFilter(QObject *object, QEvent *event) d->hidePopup(false); setPressed(false); break; +#if QT_CONFIG(im) case QEvent::InputMethod: if (d->extra.isAllocated()) d->extra->allowComplete = !static_cast<QInputMethodEvent*>(event)->commitString().isEmpty(); break; +#endif default: break; } @@ -1363,6 +1365,7 @@ void QQuickComboBox::focusOutEvent(QFocusEvent *event) setPressed(false); } +#if QT_CONFIG(im) void QQuickComboBox::inputMethodEvent(QInputMethodEvent *event) { Q_D(QQuickComboBox); @@ -1372,6 +1375,7 @@ void QQuickComboBox::inputMethodEvent(QInputMethodEvent *event) else event->ignore(); } +#endif void QQuickComboBox::keyPressEvent(QKeyEvent *event) { diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h index b6ed4906..76dce2d5 100644 --- a/src/quicktemplates2/qquickcombobox_p.h +++ b/src/quicktemplates2/qquickcombobox_p.h @@ -178,7 +178,9 @@ protected: bool eventFilter(QObject *object, QEvent *event) override; void focusInEvent(QFocusEvent *event) override; void focusOutEvent(QFocusEvent *event) override; +#if QT_CONFIG(im) void inputMethodEvent(QInputMethodEvent *event) override; +#endif void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; void mousePressEvent(QMouseEvent *event) override; |