diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:49:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:49:57 +0200 |
| commit | 66a781692a4d21ba4c8a124cb4be84e4e2ffa742 (patch) | |
| tree | 4fe9261e26281ddb5f1444563cda53c8bf39d978 /src/quicktemplates2/qquickspinbox.cpp | |
| parent | 7fec7105b7f6119135aafd6f9ee609128125d594 (diff) | |
| parent | d5fbbddd7794265f24d392d33c4874ac756cb9c9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/controls/imagine/TextArea.qml
src/imports/controls/imagine/TextField.qml
tests/auto/controls/data/tst_tumbler.qml
Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 3ce776eb..7f4f59fa 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -647,7 +647,7 @@ QJSValue QQuickSpinBox::textFromValue() const if (!d->textFromValue.isCallable()) { QQmlEngine *engine = qmlEngine(this); if (engine) - d->textFromValue = engine->evaluate(QStringLiteral("function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); }")); + d->textFromValue = engine->evaluate(QStringLiteral("(function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); })")); } return d->textFromValue; } |