From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 18 Aug 2011 11:01:05 +0000 (+0200)
Subject: Fix type of valuetype alias properties.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=50a12f04ee355752301ed54a7c21876621bb5dd4;p=konrad%2Fqtdeclarative.git

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

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index c920a33..033bd6b 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())