diff options
| author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-08-07 23:14:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:26:57 +0000 |
| commit | eadad29f9c71135378c9b92f97e140837542a469 (patch) | |
| tree | 0a6a3a8feba4af67dcaf0bbf89bbca27c0de7353 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 92ec000e5581b22b0313c9fc80c258feeb7a025f (diff) | |
Use the proper static ValueTypeProvider as intended
This was triggering an assertion while running the
unit tests.
Change-Id: I53a0216a6861a7ab7e3ec89a2b8bda0605b38aaa
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 89e8792b9f..56d566687b 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -700,7 +700,7 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) *(md->data() + id) = properties.engine()->newVariantObject(QVariant()); v = (md->data() + id)->as<QV4::VariantObject>(); } - QQmlValueTypeProvider().initValueType(t, v->d()->data); + QQml_valueTypeProvider()->initValueType(t, v->d()->data); needActivate = !QQml_valueTypeProvider()->equalValueType(t, a[0], v->d()->data); QQml_valueTypeProvider()->writeValueType(t, a[0], v->d()->data); } |