diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 7 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale_p.h | 7 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 3 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 9aba5824bb..06c446fc3b 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -794,17 +794,16 @@ QQmlLocale::~QQmlLocale() { } -QV4::ReturnedValue QQmlLocale::locale(QV8Engine *v8engine, const QString &localeName) +QV4::ReturnedValue QQmlLocale::locale(ExecutionEngine *engine, const QString &localeName) { QLocale qlocale; if (!localeName.isEmpty()) qlocale = localeName; - return wrap(v8engine, qlocale); + return wrap(engine, qlocale); } -QV4::ReturnedValue QQmlLocale::wrap(QV8Engine *engine, const QLocale &locale) +QV4::ReturnedValue QQmlLocale::wrap(ExecutionEngine *v4, const QLocale &locale) { - QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); QV4LocaleDataDeletable *d = localeV4Data(scope.engine); QV4::Scoped<QQmlLocaleData> wrapper(scope, v4->memoryManager->alloc<QQmlLocaleData>(v4)); diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 744d82a6d2..f294137340 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -38,8 +38,7 @@ #include <QtCore/qlocale.h> #include <QtCore/qobject.h> -#include <private/qv8engine_p.h> - +#include <private/qqmlglobal_p.h> QT_BEGIN_NAMESPACE @@ -110,8 +109,8 @@ public: Saturday = Qt::Saturday }; - static QV4::ReturnedValue locale(QV8Engine *v8engine, const QString &localeName); - static QV4::ReturnedValue wrap(QV8Engine *engine, const QLocale &locale); + static QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); + static QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale); static void registerStringLocaleCompare(QV4::ExecutionEngine *engine); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 4b40fa3f40..fddad75c1f 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1138,11 +1138,10 @@ ReturnedValue QtObject::method_locale(CallContext *ctx) if (ctx->d()->callData->argc == 1 && !ctx->d()->callData->args[0].isString()) V4THROW_TYPE("locale(): argument (locale code) must be a string"); - QV8Engine *v8engine = ctx->d()->engine->v8Engine; if (ctx->d()->callData->argc == 1) code = ctx->d()->callData->args[0].toQStringNoThrow(); - return QQmlLocale::locale(v8engine, code); + return QQmlLocale::locale(ctx->engine(), code); } Heap::QQmlBindingFunction::QQmlBindingFunction(QV4::FunctionObject *originalFunction) diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 4a3156b4cc..fd945babd6 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -406,7 +406,7 @@ QV4::ReturnedValue QV8Engine::fromVariant(QV4::ExecutionEngine *e, const QVarian case QMetaType::QJsonArray: return QV4::JsonObject::fromJsonArray(e, *reinterpret_cast<const QJsonArray *>(ptr)); case QMetaType::QLocale: - return QQmlLocale::wrap(e->v8Engine, *reinterpret_cast<const QLocale*>(ptr)); + return QQmlLocale::wrap(e, *reinterpret_cast<const QLocale*>(ptr)); default: break; } |