QQuickSpinBox: fix initial value validation

Task-number: QTBUG-62508
Change-Id: I8981968c02b65d4b005eb9b54b0228fd51a3abda
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 10 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index aaddfc82..1911e796 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -837,8 +837,10 @@ void QQuickSpinBox::componentComplete()
 {
     Q_D(QQuickSpinBox);
     QQuickControl::componentComplete();
-    d->updateUpEnabled();
-    d->updateDownEnabled();
+    if (!d->setValue(d->value, false)) {
+        d->updateUpEnabled();
+        d->updateDownEnabled();
+    }
 }
 
 void QQuickSpinBox::itemChange(ItemChange change, const ItemChangeData &value)
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index eced19df..71f0735c 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -582,4 +582,10 @@ TestCase {
         mouseRelease(control.up.indicator, -1, -1)
         verify(!control.up.pressed)
     }
+
+    function test_initialValue() {
+        var control = createTemporaryObject(spinBox, testCase, {from: 1000, to: 10000})
+        verify(control)
+        compare(control.value, 1000)
+    }
 }