summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-09-10 15:50:32 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-10 16:03:52 +0200
commitb00a7f03112d9a811630e2011fb8f25ff7cb0c78 (patch)
tree1cde002f2bff2222e7c3aa8ff7c2d3fcedccaea8
parent73bcbdfcef9ab9986c35d0bf64b73a377cfc1ad4 (diff)
downloadqt-creator-b00a7f03112d9a811630e2011fb8f25ff7cb0c78.tar.gz
QmlDesigner: Fix attached properties call
Accessible.role for example was not found. Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp10
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h1
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 8a2829dbe3..a33a8cd34a 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<QVariant, bool> &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 7be3f6b39d..5f40e851ea 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; }