From 78ad5069d4925445a9d39579c1f73c7911fc3582 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 11 May 2016 12:49:52 +0200 Subject: Fix warning about mixing basic font type's pointSize and pixelSize We didn't properly read the font property of TextFieldStyle (which is declared in QML) before writing the pointSize property (see bug report), so it was using the value of a previous assignment. Change-Id: I7746c258d1f3a6e031583da7f007bd0dc4087082 Task-number: QTBUG-52920 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlvmemetaobject.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index e85b3dc82c..aed5f5af35 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -665,9 +665,10 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * } else { QV4::MemberData *md = propertiesAsMemberData(); if (md) { - QV4::VariantObject *v = (md->data() + id)->as(); - if (v) - QQml_valueTypeProvider()->readValueType(v->d()->data, a[0], t); + QVariant propertyAsVariant; + if (QV4::VariantObject *v = (md->data() + id)->as()) + propertyAsVariant = v->d()->data; + QQml_valueTypeProvider()->readValueType(propertyAsVariant, a[0], t); } } break; -- cgit v1.2.3