int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTypeProp,
QDeclarativeParser::Property *prop)
{
- QByteArray data =
- QDeclarativePropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index,
- enginePrivate->valueTypes[prop->type]->metaObject(),
- valueTypeProp->index);
-// valueTypeProp->index, valueTypeProp->type);
+ typedef QDeclarativePropertyPrivate QDPP;
+ QByteArray data = QDPP::saveValueType(prop->parent->metaObject(), prop->index,
+ enginePrivate->valueTypes[prop->type]->metaObject(),
+ valueTypeProp->index, engine);
return output->indexForByteArray(data);
}
int QDeclarativeCompiler::genPropertyData(QDeclarativeParser::Property *prop)
{
- return output->indexForByteArray(QDeclarativePropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
+ typedef QDeclarativePropertyPrivate QDPP;
+ QByteArray data = QDPP::saveProperty(prop->parent->metaObject(), prop->index, engine);
+
+ return output->indexForByteArray(data);
}
bool QDeclarativeCompiler::completeComponentBuild()
}
bool QDeclarativePropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property,
- const QVariant &value, QDeclarativeContextData *context,
- WriteFlags flags)
+ const QVariant &value, QDeclarativeContextData *context,
+ WriteFlags flags)
{
int coreIdx = property.coreIndex;
int status = -1; //for dbus
};
QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObject, int index,
- const QMetaObject *subObject, int subIndex)
+ const QMetaObject *subObject, int subIndex,
+ QDeclarativeEngine *)
{
QMetaProperty prop = metaObject->property(index);
QMetaProperty subProp = subObject->property(subIndex);
return rv;
}
-QByteArray QDeclarativePropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
+QByteArray QDeclarativePropertyPrivate::saveProperty(const QMetaObject *metaObject, int index,
+ QDeclarativeEngine *engine)
{
SerializedData sd;
memset(&sd, 0, sizeof(sd));
sd.isValueType = false;
- sd.core.load(metaObject->property(index));
+ sd.core.load(metaObject->property(index), engine);
QByteArray rv((const char *)&sd, sizeof(sd));
return rv;
static QDeclarativeAbstractBinding *binding(QObject *, int coreIndex, int valueTypeIndex /* -1 */);
static QByteArray saveValueType(const QMetaObject *, int,
- const QMetaObject *, int);
- static QByteArray saveProperty(const QMetaObject *, int);
+ const QMetaObject *, int,
+ QDeclarativeEngine *);
+ static QByteArray saveProperty(const QMetaObject *, int,
+ QDeclarativeEngine *);
static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContextData *);
static QDeclarativeProperty restore(const QDeclarativePropertyCache::Data &,
--- /dev/null
+import QtQuick 1.0
+
+QtObject {
+ property int value
+}
--- /dev/null
+import QtQuick 1.0
+
+QtObject {
+ id: root
+
+ property bool test: bound.value == 1923
+
+ property ElementAssignType element: ElementAssignType { value: 1923 }
+ property ElementAssignType bound: root.element
+}
void importScripts();
void scarceResources();
void propertyChangeSlots();
+ void elementAssign();
void bug1();
void bug2();
void revisionErrors();
void revision();
+
private:
QDeclarativeEngine engine;
};
delete object;
}
+// Ensure that QObject type conversion works on binding assignment
+void tst_qdeclarativeecmascript::elementAssign()
+{
+ QDeclarativeComponent component(&engine, TEST_FILE("elementAssign.qml"));
+
+ QObject *object = component.create();
+ QVERIFY(object != 0);
+
+ QCOMPARE(object->property("test").toBool(), true);
+
+ delete object;
+}
+
// Test that assigning a null object works
// Regressed with: df1788b4dbbb2826ae63f26bdf166342595343f4
void tst_qdeclarativeecmascript::nullObjectBinding()