diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-11 12:49:52 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-11 10:59:56 +0000 |
| commit | 78ad5069d4925445a9d39579c1f73c7911fc3582 (patch) | |
| tree | 58e472cbbdbe6ccf4cdc634d8ed9532f0b27648a /src | |
| parent | 9b8d0bffdafeb4dd9b256113716c07f2c49f3903 (diff) | |
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 <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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<QV4::VariantObject>(); - if (v) - QQml_valueTypeProvider()->readValueType(v->d()->data, a[0], t); + QVariant propertyAsVariant; + if (QV4::VariantObject *v = (md->data() + id)->as<QV4::VariantObject>()) + propertyAsVariant = v->d()->data; + QQml_valueTypeProvider()->readValueType(propertyAsVariant, a[0], t); } } break; |