From fcb91a7031d003d8d766c87fea73f9622a13113f Mon Sep 17 00:00:00 2001 From: Erik Verbruggen <erik.verbruggen@nokia.com> Date: Mon, 8 Feb 2010 14:29:09 +0100 Subject: [PATCH] Fixes to get the QML designer to compile against qt-qml. --- .../core/instances/qmlpropertychangesnodeinstance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp index 9747284c78f..1d5172f1bf5 100644 --- a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp +++ b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp @@ -50,7 +50,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions() ActionList list; 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()) { a.restore = restoreEntryValues(); @@ -78,7 +78,7 @@ QmlStateOperation::ActionList QmlPropertyChangesObject::actions() QmlMetaProperty mProperty = metaProperty(property); if (mProperty.isValid()) { - Action a; + QmlAction a; a.restore = restoreEntryValues(); a.property = mProperty; a.fromValue = a.property.read(); -- GitLab