aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecompiler.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-11-09 14:13:41 +0000
committerQt by Nokia <qt-info@nokia.com>2011-11-16 13:04:50 +0100
commitcb26606bc2116f3cabd9cb5dde1d3ed7577a26a7 (patch)
treeee46eab797b51887574cbd670855a90efe72fffe /src/declarative/qml/qdeclarativecompiler.cpp
parente443db45847dcd42c0725b7df8fbda55717ad0e1 (diff)
Allow aliases to QVariant properties
Task-number: QTBUG-22464 Change-Id: I449d4fc709d34a69116258660d721596cd9b778b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
-rw-r--r--src/declarative/qml/qdeclarativecompiler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index fb98a8c0ec..d3069ecf81 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -3112,7 +3112,8 @@ bool QDeclarativeCompiler::compileAlias(QFastMetaBuilder &builder,
writable = aliasProperty.isWritable() && !prop.isReadOnly;
resettable = aliasProperty.isResettable() && !prop.isReadOnly;
- if (aliasProperty.type() < QVariant::UserType)
+ if (aliasProperty.type() < QVariant::UserType ||
+ aliasProperty.type() == QVariant::LastType /* for QVariant */ )
type = aliasProperty.type();
if (alias.count() == 3) {