diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-20 04:23:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-20 04:23:07 (GMT) |
| commit | 5b3937ce27d04ce240662521321dfdc3e1a8373b (patch) | |
| tree | 25b02b34a9a92781378c3eba1db7f78a7908938a /src/declarative/qml | |
| parent | cae5ae70dab4272e5b7313ea101ce32eb6c22240 (diff) | |
| download | Qt-5b3937ce27d04ce240662521321dfdc3e1a8373b.zip Qt-5b3937ce27d04ce240662521321dfdc3e1a8373b.tar.gz Qt-5b3937ce27d04ce240662521321dfdc3e1a8373b.tar.bz2 | |
Ensure valuetype enums can be assigned from JS
QTBUG-10830
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetypescriptclass.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp index cb1f27d..f06d6ae 100644 --- a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp +++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp @@ -168,6 +168,8 @@ void QDeclarativeValueTypeScriptClass::setProperty(Object *obj, const Identifier ref->type->read(ref->object, ref->property); QMetaProperty p = ref->type->metaObject()->property(m_lastIndex); + if (p.isEnumType() && (QMetaType::Type)v.type() == QMetaType::QReal) + v = v.toInt(); p.write(ref->type, v); ref->type->write(ref->object, ref->property, 0); } else { |