From 221fc011b8430ab79551818d5d72f4bde7f66984 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 12 Feb 2010 10:43:33 +0100
Subject: [PATCH] Compile.
---
src/libs/qmljs/qmljsinterpreter.cpp | 4 ++--
src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 155767615b7..8f8c2a47443 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -231,8 +231,8 @@ void QmlObjectValue::processMembers(MemberProcessor *processor) const
const Value *QmlObjectValue::propertyValue(const QMetaProperty &prop) const
{
- if (QmlMetaType::isObject(prop.userType())) {
- QmlType *qmlPropertyType = QmlMetaType::qmlType(QmlMetaType::metaObjectForType(prop.userType()));
+ if (QmlMetaType::isQObject(prop.userType())) {
+ QmlType *qmlPropertyType = QmlMetaType::qmlType(prop.userType());
if (qmlPropertyType && !qmlPropertyType->qmlTypeName().isEmpty()) {
QString typeName = qmlPropertyType->qmlTypeName();
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index 3f753cc755d..34192e67782 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -525,7 +525,7 @@ void ObjectNodeInstance::updateObjectSignals(QObject *object)
int transformSignalIndex = QGraphicsObject::staticMetaObject.indexOfSignal("xChanged()");
// iterate over all proeprties and find the object
for(int propertyIndex = QObject::staticMetaObject.propertyCount(); propertyIndex < object->metaObject()->propertyCount(); propertyIndex++) {
- if (QmlMetaType::isObject(object->metaObject()->property(propertyIndex).userType())) {
+ if (QmlMetaType::isQObject(object->metaObject()->property(propertyIndex).userType())) {
QObject *propertyObject = QmlMetaType::toQObject(object->metaObject()->property(propertyIndex).read(object));
if (propertyObject) {
int signalIndex = -1;
--
GitLab