diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-21 13:18:23 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-11 08:40:48 +0100 |
| commit | 4322c8d7686c7cbbdf348146d32d705007b21d56 (patch) | |
| tree | c60d6568f3b47786b24c0d74eb6e61b7cac18add /src/qml/jsapi/qjsengine.cpp | |
| parent | ddfe9defa803fdbfab10ab58b77df242cdb4cedd (diff) | |
Better encapsulate access to the global object
Change-Id: I8a76112d821cb3fc172ba0d16ee8410d39b4422a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index ccf4c47eac..bd78b7d051 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -254,7 +254,7 @@ void QJSEngine::installTranslatorFunctions(const QJSValue &object) QJSValuePrivate *vp = QJSValuePrivate::get(object); QV4::ScopedObject obj(scope, vp->getValue(v4)); if (!obj) - obj = v4->globalObject; + obj = v4->globalObject(); #ifndef QT_NO_TRANSLATION obj->defineDefaultProperty(QStringLiteral("qsTranslate"), QV4::GlobalExtensions::method_qsTranslate); obj->defineDefaultProperty(QStringLiteral("QT_TRANSLATE_NOOP"), QV4::GlobalExtensions::method_qsTranslateNoOp); @@ -397,7 +397,7 @@ QJSValue QJSEngine::globalObject() const { Q_D(const QJSEngine); QV4::Scope scope(d->m_v4Engine); - QV4::ScopedValue v(scope, d->m_v4Engine->globalObject); + QV4::ScopedValue v(scope, d->m_v4Engine->globalObject()); return new QJSValuePrivate(d->m_v4Engine, v); } |