aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quicktemplates/qquickspinbox.cpp3
-rw-r--r--tests/auto/quickcontrols/controls/data/tst_spinbox.qml5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/quicktemplates/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp
index fe5c5ba8a9..02b680b05b 100644
--- a/src/quicktemplates/qquickspinbox.cpp
+++ b/src/quicktemplates/qquickspinbox.cpp
@@ -240,7 +240,8 @@ void QQuickSpinBoxPrivate::contentItemTextChanged()
return;
QString text = inputTextItem->text();
#if QT_CONFIG(validator)
- validator->fixup(text);
+ if (validator)
+ validator->fixup(text);
#endif
if (live) {
diff --git a/tests/auto/quickcontrols/controls/data/tst_spinbox.qml b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
index f9a41b9ca6..34f8b3f97e 100644
--- a/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
@@ -1119,4 +1119,9 @@ TestCase {
mouseClick(control.up.indicator) // +1
compare(control.value, 0)
}
+
+ function test_nullValidator() {
+ var control = createTemporaryObject(spinBox, testCase, { validator: null })
+ verify(control)
+ }
}