summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompiler.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-21 03:40:03 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-21 03:40:03 (GMT)
commit11db0632758db443c3fb336dae23da83a358e73d (patch)
tree40bb3b87c28a41d8dc5686aa00e59c27937064b5 /src/declarative/qml/qmlcompiler.cpp
parentdb0cfede616fbed94333615d1f6c1fabad46d088 (diff)
downloadQt-11db0632758db443c3fb336dae23da83a358e73d.zip
Qt-11db0632758db443c3fb336dae23da83a358e73d.tar.gz
Qt-11db0632758db443c3fb336dae23da83a358e73d.tar.bz2
Allow composite value sources
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
-rw-r--r--src/declarative/qml/qmlcompiler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 4ee59b3..fedc1ee 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1610,7 +1610,7 @@ void QmlCompiler::genPropertyAssignment(QmlParser::Property *prop,
store.assignValueSource.property = genPropertyData(prop);
store.assignValueSource.owner = 0;
}
- QmlType *valueType = QmlMetaType::qmlType(v->object->metatype);
+ QmlType *valueType = toQmlType(v->object);
store.assignValueSource.castValue = valueType->propertyValueSourceCast();
output->bytecode << store;
@@ -1627,7 +1627,7 @@ void QmlCompiler::genPropertyAssignment(QmlParser::Property *prop,
store.assignValueInterceptor.property = genPropertyData(prop);
store.assignValueInterceptor.owner = 0;
}
- QmlType *valueType = QmlMetaType::qmlType(v->object->metatype);
+ QmlType *valueType = toQmlType(v->object);
store.assignValueInterceptor.castValue = valueType->propertyValueInterceptorCast();
output->bytecode << store;
@@ -1995,7 +1995,7 @@ bool QmlCompiler::buildPropertyObjectAssignment(QmlParser::Property *prop,
bool isPropertyValue = false;
// Will be true if the assigned type inherits QmlPropertyValueInterceptor
bool isPropertyInterceptor = false;
- if (QmlType *valueType = QmlMetaType::qmlType(v->object->metatype)) {
+ if (QmlType *valueType = toQmlType(v->object)) {
isPropertyValue = valueType->propertyValueSourceCast() != -1;
isPropertyInterceptor = valueType->propertyValueInterceptorCast() != -1;
}