diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-30 22:27:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-01 09:27:35 +0200 |
| commit | be2b623bcfa3a3781771e8d44a4f12e3725775e9 (patch) | |
| tree | b9d2f2fdabd970c2fc8d8a0be30b04339275a8ac /src/qml/util | |
| parent | 382509a7f8753e2a11315eeb2086b27b6bc50a61 (diff) | |
Move QV8Engine::to/fromVariant over to a v4 based API
Change-Id: Ie44de10cbd970715345e2c428db666dc6233b39c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/util')
| -rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 5b6ef79338..35cc2170ac 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -361,10 +361,10 @@ void QQmlDMCachedModelData::set_property( QQmlDMCachedModelData *modelData = static_cast<QQmlDMCachedModelData *>(data); if (!modelData->cachedData.isEmpty()) { if (modelData->cachedData.count() > 1) { - modelData->cachedData[propertyId] = data->engine->toVariant(value, QVariant::Invalid); + modelData->cachedData[propertyId] = data->engine->toVariant(value->v4Value(), QVariant::Invalid); QMetaObject::activate(data, data->metaObject(), propertyId, 0); } else if (modelData->cachedData.count() == 1) { - modelData->cachedData[0] = data->engine->toVariant(value, QVariant::Invalid); + modelData->cachedData[0] = data->engine->toVariant(value->v4Value(), QVariant::Invalid); QMetaObject::activate(data, data->metaObject(), 0, 0); QMetaObject::activate(data, data->metaObject(), 1, 0); } @@ -596,7 +596,7 @@ public: V8ASSERT_TYPE_SETTER(data, "Not a valid VisualData object"); static_cast<QQmlDMListAccessorData *>(data)->setModelData( - data->engine->toVariant(value, QVariant::Invalid)); + data->engine->toVariant(value->v4Value(), QVariant::Invalid)); } v8::Handle<v8::Value> get() |