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

Fix compilation against latest qt-dui

Browse Source 
d914555badc in qt-dui/master removed QmlType::fromObject. This
patch replaces the method with QVariant::fromValue. The difference
here is that the QVariant type is always QObject*, instead of
the real inherited type. We have yet to verify if this breaks something.
This commit is contained in:
Kai Koehne
2010-02-09 14:34:35 +01:00
parent 978c89f506
commit f4983380df
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -83,7 +83,7 @@ void createPropertyEditorValue(const QmlObjectNode &fxObjectNode, const QString
valueObject = new PropertyEditorValue(propertyMap); valueObject = new PropertyEditorValue(propertyMap);
QObject::connect(valueObject, SIGNAL(valueChanged(QString)), propertyMap, SIGNAL(valueChanged(QString))); QObject::connect(valueObject, SIGNAL(valueChanged(QString)), propertyMap, SIGNAL(valueChanged(QString)));
QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString))); QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString)));
propertyMap->insert(propertyName, QmlMetaType::qmlType(valueObject->metaObject())->fromObject(valueObject)); propertyMap->insert(propertyName, QVariant::fromValue(valueObject));
} }
valueObject->setName(propertyName); valueObject->setName(propertyName);
valueObject->setModelNode(fxObjectNode); valueObject->setModelNode(fxObjectNode);
@@ -129,14 +129,14 @@ void PropertyEditor::NodeType::setup(const QmlObjectNode &fxObjectNode, const QS
valueObject->setModelNode(fxObjectNode.modelNode()); valueObject->setModelNode(fxObjectNode.modelNode());
valueObject->setValue(fxObjectNode.modelNode().simplifiedTypeName()); valueObject->setValue(fxObjectNode.modelNode().simplifiedTypeName());
QObject::connect(valueObject, SIGNAL(valueChanged(QString)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString))); QObject::connect(valueObject, SIGNAL(valueChanged(QString)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString)));
m_backendValuesPropertyMap.insert("className", QmlMetaType::qmlType(valueObject->metaObject())->fromObject(valueObject)); m_backendValuesPropertyMap.insert("className", QVariant::fromValue(valueObject));
// id // id
valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap); valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
valueObject->setName("id"); valueObject->setName("id");
valueObject->setValue(fxObjectNode.id()); valueObject->setValue(fxObjectNode.id());
QObject::connect(valueObject, SIGNAL(valueChanged(QString)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString))); QObject::connect(valueObject, SIGNAL(valueChanged(QString)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString)));
m_backendValuesPropertyMap.insert("id", QmlMetaType::qmlType(valueObject->metaObject())->fromObject(valueObject)); m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject));
// anchors // anchors
m_backendAnchorBinding.setup(QmlItemNode(fxObjectNode.modelNode())); m_backendAnchorBinding.setup(QmlItemNode(fxObjectNode.modelNode()));

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
View File

@@ -306,7 +306,7 @@ void PropertyEditorNodeWrapper::setup()
valueObject->setValue(fxObjectNode.instanceValue(propertyName)); valueObject->setValue(fxObjectNode.instanceValue(propertyName));
connect(valueObject, SIGNAL(valueChanged(QString)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString))); connect(valueObject, SIGNAL(valueChanged(QString)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString)));
m_valuesPropertyMap.insert(propertyName, QmlMetaType::qmlType(valueObject->metaObject())->fromObject(valueObject)); m_valuesPropertyMap.insert(propertyName, QVariant::fromValue(valueObject));
} }
} }
connect(&m_valuesPropertyMap, SIGNAL(valueChanged(const QString &)), this, SLOT(changeValue(const QString&))); connect(&m_valuesPropertyMap, SIGNAL(valueChanged(const QString &)), this, SLOT(changeValue(const QString&)));

5
src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
View File

@@ -301,10 +301,7 @@ static bool isObject(const QmlMetaProperty &metaProperty)
static QVariant objectToVariant(QObject *object) static QVariant objectToVariant(QObject *object)
{ {
const QMetaObject *metaObject = object->metaObject(); return QVariant::fromValue(object);
QmlType *qmlType = QmlMetaType::qmlType(metaObject);
return qmlType->fromObject(object);
} }
static void removeObjectFromList(const QmlMetaProperty &metaProperty, QObject *object, QmlEngine *engine) static void removeObjectFromList(const QmlMetaProperty &metaProperty, QObject *object, QmlEngine *engine)