diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-04 10:05:51 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-04 11:58:10 +0200 |
commit | 19ded50946fa40146914771b1d8eaa22f51da803 (patch) | |
tree | d0e10bdef5f6ec9ffa529eafde7fd3f5f9df4fff /tests/auto/qml/qqmlecmascript/testtypes.h | |
parent | 1dbbecda8b4e34196d07ecfea65de87b0bd8b83a (diff) |
Cleanups in QObject bindings
* Rename v8object to jsWrapper in QQmlData
* Rename v8objectid to jsEngineId, as that's the identifier of the engine
that currently owns the primary JS wrapper
This is in preparation for moving newObject away from QV8QObjectWrapper
Change-Id: I6432365e849d159600e22f09e7e2ab2ae2117db6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.h')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index 3752dd8574..7205155a99 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -1205,13 +1205,13 @@ public: { QQmlData *ddata = QQmlData::get(this); assert(ddata); - QV4::QObjectWrapper *thisObject = ddata->v8object.value().as<QV4::QObjectWrapper>(); + QV4::QObjectWrapper *thisObject = ddata->jsWrapper.value().as<QV4::QObjectWrapper>(); assert(thisObject); QQmlData *otherDData = QQmlData::get(other); assert(otherDData); - thisObject->defineDefaultProperty(thisObject->engine(), QStringLiteral("autoTestStrongRef"), otherDData->v8object.value()); + thisObject->defineDefaultProperty(thisObject->engine(), QStringLiteral("autoTestStrongRef"), otherDData->jsWrapper.value()); } void setEngine(QQmlEngine* declarativeEngine) |