feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix attached properties call

Browse Source 
Accessible.role for example was not found.

Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-09-10 15:50:32 +02:00
committed by Thomas Hartmann
parent 73bcbdfcef
commit b00a7f0311
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
View File

@@ -199,7 +199,8 @@ NodeInstanceMetaObject::~NodeInstanceMetaObject()
void NodeInstanceMetaObject::createNewProperty(const QString &name) void NodeInstanceMetaObject::createNewProperty(const QString &name)
{ {
int id = createProperty(name.toUtf8(), 0); int id = m_type->createProperty(name.toUtf8());
copyTypeMetaObject();
setValue(id, QVariant()); setValue(id, QVariant());
Q_ASSERT(id >= 0); Q_ASSERT(id >= 0);
Q_UNUSED(id); Q_UNUSED(id);
@@ -214,13 +215,6 @@ void NodeInstanceMetaObject::createNewProperty(const QString &name)
Q_ASSERT(property.isValid()); 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) void NodeInstanceMetaObject::setValue(int id, const QVariant &value)
{ {
QPair<QVariant, bool> &prop = m_data->getDataRef(id); QPair<QVariant, bool> &prop = m_data->getDataRef(id);

1
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
View File

@@ -63,7 +63,6 @@ protected:
int metaCall(QMetaObject::Call _c, int _id, void **_a); int metaCall(QMetaObject::Call _c, int _id, void **_a);
void notifyPropertyChange(int id); void notifyPropertyChange(int id);
void setValue(int id, const QVariant &value); void setValue(int id, const QVariant &value);
int createProperty(const char *, const char *);
QVariant propertyWriteValue(int, const QVariant &); QVariant propertyWriteValue(int, const QVariant &);
QObject *myObject() const { return QQmlVMEMetaObject::object; } QObject *myObject() const { return QQmlVMEMetaObject::object; }