From e615cf82a532926e40ab026fbc7753cc22587b15 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Tue, 6 Apr 2010 12:56:53 +0200
Subject: [PATCH] Fixed regression when assigning an object binding to an array
property.
---
src/libs/qmljs/qmljsinterpreter.cpp | 12 ++++++++++
src/libs/qmljs/qmljsinterpreter.h | 1 +
.../core/model/texttomodelmerger.cpp | 24 +++++++++++++------
.../qml/qmldesigner/coretests/testcore.cpp | 1 -
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index db26ca7fb1b..514c734c23c 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -187,6 +187,9 @@ public:
QString typeName() const
{ return m_type; }
+
+ bool isList() const
+ { return m_isList; }
};
class FakeMetaObject {
@@ -859,6 +862,15 @@ QString QmlObjectValue::propertyType(const QString &propertyName) const
return QString();
}
+bool QmlObjectValue::isListProperty(const QString &name) const
+{
+ int idx = _metaObject->propertyIndex(name);
+ if (idx == -1)
+ return false;
+ FakeMetaProperty prop = _metaObject->property(idx);
+ return prop.isList();
+}
+
bool QmlObjectValue::isEnum(const QString &typeName) const
{
return _metaObject->enumeratorIndex(typeName) != -1;
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 461e6a718fe..97800977b7b 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -418,6 +418,7 @@ public:
int minorVersion() const;
QString defaultPropertyName() const;
QString propertyType(const QString &propertyName) const;
+ bool isListProperty(const QString &name) const;
bool isEnum(const QString &typeName) const;
protected:
diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
index b873af7d9f5..5a827cc5a78 100644
--- a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
@@ -303,15 +303,23 @@ public:
return true;
}
- bool isArrayProperty(const Interpreter::Value *value)
+ bool isArrayProperty(const Interpreter::Value *value, const Interpreter::ObjectValue *containingObject, const QString &name)
{
if (!value)
return false;
const Interpreter::ObjectValue *objectValue = value->asObjectValue();
- if (!objectValue)
- return false;
+ if (objectValue && objectValue->prototype(m_context) == m_engine->arrayPrototype())
+ return true;
- return objectValue->prototype(m_context) == m_engine->arrayPrototype();
+ for (const Interpreter::ObjectValue *iter = containingObject; iter; iter = iter->prototype(m_context)) {
+ if (iter->property(name, m_context) == m_engine->arrayPrototype())
+ return true;
+ if (const Interpreter::QmlObjectValue *qmlIter = dynamic_cast<const Interpreter::QmlObjectValue *>(iter)) {
+ if (qmlIter->isListProperty(name))
+ return true;
+ }
+ }
+ return false;
}
QVariant convertToVariant(const QString &astValue, UiQualifiedId *propertyId)
@@ -580,10 +588,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (binding->hasOnToken) {
// skip value sources
} else {
- const Interpreter::Value *propertyType;
- if (context->lookupProperty(binding->qualifiedId, &propertyType) || typeName == QLatin1String("Qt/PropertyChanges")) {
+ const Interpreter::Value *propertyType = 0;
+ const Interpreter::ObjectValue *containingObject = 0;
+ QString name;
+ if (context->lookupProperty(binding->qualifiedId, &propertyType, &containingObject, &name) || typeName == QLatin1String("Qt/PropertyChanges")) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
- if (context->isArrayProperty(propertyType)) {
+ if (context->isArrayProperty(propertyType, containingObject, name)) {
syncArrayProperty(modelProperty, QList<QmlJS::AST::UiObjectMember*>() << member, context, differenceHandler);
} else {
syncNodeProperty(modelProperty, binding, context, differenceHandler);
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index 9e55914569f..eb5b029ef29 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -133,7 +133,6 @@ void TestCore::testModelCreateCoreModel()
// TODO: this need to e updated for states
void TestCore::loadEmptyCoreModel()
{
- QList<QDeclarativeError> errors;
QFile file(":/fx/empty.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
--
GitLab