diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 17:22:08 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-16 21:12:57 +0100 |
| commit | 498d4322ce87b20a798d4c9fbf4f7d84c1730486 (patch) | |
| tree | f2bd8763b894d3a50f2007a1af8df03a0c3fa83d /src/qml/jsapi | |
| parent | 8ffb79bbd214c239e414dc4e9cf4569b3219bdab (diff) | |
Don't require an ExecutionEngine member in String anymore
Change-Id: I7c1a5471507669871564d79dc17d1026c268b6d0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index a158d3ad72..0a29e7802c 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -974,7 +974,7 @@ QJSValue QJSValue::property(const QString& name) const if (idx < UINT_MAX) return property(idx); - s->makeIdentifier(); + s->makeIdentifier(engine); QV4::ScopedValue result(scope, o->get(s)); if (engine->hasException) result = engine->catchException(); @@ -1045,7 +1045,7 @@ void QJSValue::setProperty(const QString& name, const QJSValue& value) return; } - s->makeIdentifier(); + s->makeIdentifier(scope.engine); QV4::ScopedValue v(scope, value.d->getValue(engine)); o->put(s, v); if (engine->hasException) |