From: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Date: Fri, 7 Aug 2015 21:14:21 +0000 (+0200)
Subject: Use the proper static ValueTypeProvider as intended
X-Git-Tag: v5.5.90+alpha1~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eadad29f9c71135378c9b92f97e140837542a469;p=platform%2Fupstream%2Fqtdeclarative.git

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>
---

diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 89e8792b9..56d566687 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);
                             }