diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2011-08-18 13:01:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | 50a12f04ee355752301ed54a7c21876621bb5dd4 (patch) | |
| tree | 7f849b9c75b86bde17e445c8f777ce76df668991 /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | d248f974502e61f88d3364e508cad2b4cf88745f (diff) | |
Fix type of valuetype alias properties.
Update the type and the typename after changing the value of
aliasProperty.
Change-Id: Id0b9d9a66f14524fec6bf23c375ae9af448cbbf3
Reviewed-on: http://codereview.qt.nokia.com/3790
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index c920a33852..033bd6bc1c 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2999,6 +2999,11 @@ bool QDeclarativeCompiler::compileAlias(QFastMetaBuilder &builder, aliasProperty = valueType->metaObject()->property(valueTypeIndex); propIdx |= (valueTypeIndex << 16); + + // update the property type + type = aliasProperty.type(); + if (type >= QVariant::UserType) + type = 0; } if (aliasProperty.isEnumType()) |