qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with -no-feature-qml-locale 

Pick-to: 6.5
Change-Id: I1e275c6258218f20b6ccb662d4af310f97163248
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tasuku Suzuki 2023-02-11 23:01:03 +09:00
parent 8b66c0e5be
commit 9752320473
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/quicktemplates/qquickspinbox.cpp
View File

@ -10,7 +10,9 @@
#include <QtGui/qstylehints.h>
#include <QtQml/qqmlinfo.h>
#if QT_CONFIG(qml_locale)
#include <QtQml/private/qqmllocale_p.h>
#endif
#include <QtQml/private/qqmlengine_p.h>
#include <QtQuick/private/qquicktextinput_p.h>
@ -155,8 +157,11 @@ void QQuickSpinBoxPrivate::updateValue()
int val = 0;
QQmlEngine *engine = qmlEngine(q);
if (engine && valueFromText.isCallable()) {
QJSValue loc;
#if QT_CONFIG(qml_locale)
QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine);
QJSValue loc = QJSValuePrivate::fromReturnedValue(QQmlLocale::wrap(v4, locale));
loc = QJSValuePrivate::fromReturnedValue(QQmlLocale::wrap(v4, locale));
#endif
val = valueFromText.call(QJSValueList() << text.toString() << loc).toInt();
} else {
val = locale.toInt(text.toString());
@ -223,8 +228,11 @@ void QQuickSpinBoxPrivate::updateDisplayText(bool modified)
QString text;
QQmlEngine *engine = qmlEngine(q);
if (engine && textFromValue.isCallable()) {
QJSValue loc;
#if QT_CONFIG(qml_locale)
QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine);
QJSValue loc = QJSValuePrivate::fromReturnedValue(QQmlLocale::wrap(v4, locale));
loc = QJSValuePrivate::fromReturnedValue(QQmlLocale::wrap(v4, locale));
#endif
text = textFromValue.call(QJSValueList() << value << loc).toString();
} else {
text = locale.toString(value);