aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmllocale.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2014-12-31 13:26:48 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2015-01-08 22:09:02 +0100
commit46b3909e85c6afe6397b9189e7889c3a457c558b (patch)
tree0af4350a8a80c6faff4ebb9f81ae624238846b17 /src/qml/qml/qqmllocale.cpp
parenta6c36616b0ccf9c1aeb71d90437c9226ae76fe10 (diff)
Remove v8engine dependency from qqmllocale
Change-Id: Ib6f51915c5a049592c2958624017eb2f8ad962d8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
-rw-r--r--src/qml/qml/qqmllocale.cpp7
1 files changed, 3 insertions, 4 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));