diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-27 11:56:10 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-27 17:49:27 +0000 |
commit | 990862b162111d0002e38bc270aec48bb706d9fb (patch) | |
tree | f5a10460d0275d0c7f7132a7f533da0a009f1f07 | |
parent | b02c7b3145d4c5806c5ea89b0915d1c85873a29c (diff) |
QQuickSpinBox: fix internal setValue() arguments
Task-number: QTBUG-64075
Change-Id: Ifd48b6d0075ab1930be3d759b18292b5038bcc17
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 714a7ec5..aaf0fbad 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -189,7 +189,7 @@ void QQuickSpinBoxPrivate::updateValue() QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine); QJSValue loc(v4, QQmlLocale::wrap(v4, locale)); QJSValue val = q->valueFromText().call(QJSValueList() << text.toString() << loc); - setValue(val.toInt(), /* modified = */ true, /* allowWrap = */ false); + setValue(val.toInt(), /* allowWrap = */ false, /* modified = */ true); } } } @@ -884,7 +884,7 @@ void QQuickSpinBox::componentComplete() { Q_D(QQuickSpinBox); QQuickControl::componentComplete(); - if (!d->setValue(d->value, /* modified = */ false, /* allowWrap = */ false)) { + if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) { d->updateUpEnabled(); d->updateDownEnabled(); } diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 003468a1..5a3b1f29 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -367,6 +367,9 @@ TestCase { var control = createTemporaryObject(spinBox, testCase) verify(control) + var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"}) + verify(valueModifiedSpy.valid) + control.contentItem.forceActiveFocus() compare(control.contentItem.activeFocus, true) @@ -375,6 +378,7 @@ TestCase { keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 0) + compare(valueModifiedSpy.count, 0) control.editable = true compare(control.editable, true) @@ -382,6 +386,7 @@ TestCase { keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 5) + compare(valueModifiedSpy.count, 1) } function test_wheel_data() { |