diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-08 10:53:43 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-10 11:08:30 +0000 |
| commit | 7bcc12dd3288dc3d38ec580af72d3a4a7d18ded0 (patch) | |
| tree | 18cb04e2fc0261aef2fa0993d2dcf1d05d1a479f /src/quicktemplates2 | |
| parent | a75173de4b70ee83fb6e845b59f3c9caf880a376 (diff) | |
Build fix for -no-feature-validator
Change-Id: I869b25ff2c9efe1c21def0baf4de0606c7c9baa2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 95980e6b..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(); } @@ -1548,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 |