From 1dd3cd0ada60b3d8316aa330b610e9e18d01b216 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 27 Jul 2020 16:20:47 +0200 Subject: QQuickSpinBox: fix another "function expressions as statements" warning This amends d5fbbddd7794265f24d392d33c4874ac756cb9c9 by also fixing valueFromText(). Task-number: QTBUG-64151 Change-Id: I02b053bb4d4579e86eaaa2279826f3b103800fdf Reviewed-by: Fabian Kosmale (cherry picked from commit 2d0794cbc73a6913bea075804f232c4996d5fc4d) Reviewed-by: Qt Cherry-pick Bot --- src/quicktemplates2/qquickspinbox.cpp | 2 +- tests/auto/controls/data/tst_spinbox.qml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 3482af8c..cfd75104 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -698,7 +698,7 @@ QJSValue QQuickSpinBox::valueFromText() const if (!d->valueFromText.isCallable()) { QQmlEngine *engine = qmlEngine(this); if (engine) - d->valueFromText = engine->evaluate(QStringLiteral("function(text, locale) { return Number.fromLocaleString(locale, text); }")); + d->valueFromText = engine->evaluate(QStringLiteral("(function(text, locale) { return Number.fromLocaleString(locale, text); })")); } return d->valueFromText; } diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 22dbb352..4ff80686 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -549,6 +549,12 @@ TestCase { compare(valueFromTextCalls, data.editable ? 3 : 0) } + function test_callDefaultValueFromText() { + var control = createTemporaryObject(spinBox, testCase) + verify(control) + compare(control.valueFromText("123", control.locale), 123) + } + function test_autoRepeat() { var control = createTemporaryObject(spinBox, testCase) verify(control) @@ -659,6 +665,12 @@ TestCase { } } + function test_callDefaultTextFromValue() { + var control = createTemporaryObject(spinBox, testCase) + verify(control) + compare(control.textFromValue(123, control.locale), "123") + } + Component { id: overriddenSpinBox SpinBox { -- cgit v1.2.3