diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
tree | a390a1b5909c0396271be5f29b818ba114328e70 /src/quicktemplates2/qquickspinbox.cpp | |
parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
-rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 69b315b2..714a7ec5 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -884,8 +884,10 @@ void QQuickSpinBox::componentComplete() { Q_D(QQuickSpinBox); QQuickControl::componentComplete(); - d->updateUpEnabled(); - d->updateDownEnabled(); + if (!d->setValue(d->value, /* modified = */ false, /* allowWrap = */ false)) { + d->updateUpEnabled(); + d->updateDownEnabled(); + } } void QQuickSpinBox::itemChange(ItemChange change, const ItemChangeData &value) |