From b00a7f03112d9a811630e2011fb8f25ff7cb0c78 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 10 Sep 2013 15:50:32 +0200 Subject: [PATCH] QmlDesigner: Fix attached properties call Accessible.role for example was not found. Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3 Reviewed-by: Thomas Hartmann --- .../qml2puppet/instances/nodeinstancemetaobject.cpp | 10 ++-------- .../qml2puppet/instances/nodeinstancemetaobject.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp index 8a2829dbe30..a33a8cd34af 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp @@ -199,7 +199,8 @@ NodeInstanceMetaObject::~NodeInstanceMetaObject() void NodeInstanceMetaObject::createNewProperty(const QString &name) { - int id = createProperty(name.toUtf8(), 0); + int id = m_type->createProperty(name.toUtf8()); + copyTypeMetaObject(); setValue(id, QVariant()); Q_ASSERT(id >= 0); Q_UNUSED(id); @@ -214,13 +215,6 @@ void NodeInstanceMetaObject::createNewProperty(const QString &name) Q_ASSERT(property.isValid()); } -int NodeInstanceMetaObject::createProperty(const char *name, const char *) -{ - int id = m_type->createProperty(name); - copyTypeMetaObject(); - return id; -} - void NodeInstanceMetaObject::setValue(int id, const QVariant &value) { QPair &prop = m_data->getDataRef(id); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h index 7be3f6b39d7..5f40e851ea6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h @@ -63,7 +63,6 @@ protected: int metaCall(QMetaObject::Call _c, int _id, void **_a); void notifyPropertyChange(int id); void setValue(int id, const QVariant &value); - int createProperty(const char *, const char *); QVariant propertyWriteValue(int, const QVariant &); QObject *myObject() const { return QQmlVMEMetaObject::object; }