Commit fcb91a70 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Fixes to get the QML designer to compile against qt-qml.

parent a6b1fb94
...@@ -50,7 +50,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions() ...@@ -50,7 +50,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions()
ActionList list; ActionList list;
foreach (const QString &property, m_properties.keys()) { foreach (const QString &property, m_properties.keys()) {
Action a(m_targetObject.data(), property, m_properties.value(property)); QmlAction a(m_targetObject.data(), property, m_properties.value(property));
if (a.property.isValid()) { if (a.property.isValid()) {
a.restore = restoreEntryValues(); a.restore = restoreEntryValues();
...@@ -78,7 +78,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions() ...@@ -78,7 +78,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions()
QmlMetaProperty mProperty = metaProperty(property); QmlMetaProperty mProperty = metaProperty(property);
if (mProperty.isValid()) { if (mProperty.isValid()) {
Action a; QmlAction a;
a.restore = restoreEntryValues(); a.restore = restoreEntryValues();
a.property = mProperty; a.property = mProperty;
a.fromValue = a.property.read(); a.fromValue = a.property.read();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment