summaryrefslogtreecommitdiff
path: root/src/controls/SpinBox.qml
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-09-18 15:19:06 +0200
committerGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-09-18 15:19:06 +0200
commit46f3cc477fc00aae887f085e063d6cb10bfdcd4c (patch)
tree0585601759ccbae2ed2abecedaf16e06b80676d0 /src/controls/SpinBox.qml
parent4c184095d378622fb0c3bb1692b331b3cc04e010 (diff)
parent04e000d2b1719696581bb4ae6ec21e39236ef38c (diff)
downloadqtquickcontrols-46f3cc477fc00aae887f085e063d6cb10bfdcd4c.tar.gz
Merge branch 'stable' into dev
Conflicts: src/controls/qquickaction.cpp Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
Diffstat (limited to 'src/controls/SpinBox.qml')
-rw-r--r--src/controls/SpinBox.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index 473fe6db..b062ffe5 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -229,8 +229,9 @@ Control {
validator: SpinBoxValidator {
id: validator
- onTextChanged: input.text = validator.text
- Component.onCompleted: input.text = validator.text
+ property bool ready: false // Delay validation until all properties are ready
+ onTextChanged: if (ready) input.text = validator.text
+ Component.onCompleted: {input.text = validator.text ; ready = true}
}
onAccepted: {
input.text = validator.text