diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-03-11 12:50:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-14 12:47:20 +0000 |
| commit | 3e45909f00d4982aa9acfdca52ecd7fff079fa76 (patch) | |
| tree | a2dace34c4bf0a7bd21d13560c3cc02cf19efba4 | |
| parent | 6b1f8d471664ea20d6be0b0ac66de17acd996a05 (diff) | |
fix crash in qquickspinbox.cpp
With a custom style, the validator might not be set
initially or at all.
Task-number: QTBUG-123160
Change-Id: Idd4b801e75737fa2cfac112d06f9f7ad04278c26
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit 6e853af5b97d71d0cffa978a2bf502083c222348)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e68b9dc5882382169225f6f409e510a4f52dd6d7)
| -rw-r--r-- | src/quicktemplates/qquickspinbox.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quickcontrols/controls/data/tst_spinbox.qml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/quicktemplates/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp index 5dce7809a5..2a68edac33 100644 --- a/src/quicktemplates/qquickspinbox.cpp +++ b/src/quicktemplates/qquickspinbox.cpp @@ -244,7 +244,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 9c3b1bb3a9..51c3825127 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) + } } |