diff options
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 3aabd238..29fa5e55 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1158,8 +1158,10 @@ void QQuickComboBox::setValidator(QValidator *validator) return; d->extra.value().validator = validator; +#if QT_CONFIG(validator) if (validator) validator->setLocale(d->locale); +#endif emit validatorChanged(); } @@ -1337,10 +1339,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 +1367,7 @@ void QQuickComboBox::focusOutEvent(QFocusEvent *event) setPressed(false); } +#if QT_CONFIG(im) void QQuickComboBox::inputMethodEvent(QInputMethodEvent *event) { Q_D(QQuickComboBox); @@ -1372,6 +1377,7 @@ void QQuickComboBox::inputMethodEvent(QInputMethodEvent *event) else event->ignore(); } +#endif void QQuickComboBox::keyPressEvent(QKeyEvent *event) { @@ -1544,8 +1550,10 @@ void QQuickComboBox::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) void QQuickComboBox::localeChange(const QLocale &newLocale, const QLocale &oldLocale) { QQuickControl::localeChange(newLocale, oldLocale); +#if QT_CONFIG(validator) if (QValidator *v = validator()) v->setLocale(newLocale); +#endif } QFont QQuickComboBox::defaultFont() const |