From 34f9d5c89ec7015986d92812bae2c38ea9c2d2a9 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 5 May 2010 11:19:01 +0200 Subject: Revert "Fixes: make compile after qml renaming dated 22/04/2010" This reverts commit 84d6ea75bc4afe335ece05f1cb31a222294b3718. This branch is supposed to compile against Qt 4.7-beta1 . --- .../core/instances/qmlgraphicsitemnodeinstance.cpp | 18 +++++++++--------- .../core/instances/qmlpropertychangesnodeinstance.cpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp index a467130128..84c9464ef7 100644 --- a/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp +++ b/src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp @@ -437,32 +437,32 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name) // qmlGraphicsItem()->anchors()->setVerticalCenterOffset(anchors.margin(AnchorLine::VerticalCenter)); //} -QDeclarativeAnchors::Anchor anchorLineFlagForName(const QString &name) +QDeclarativeAnchors::UsedAnchor anchorLineFlagForName(const QString &name) { if (name == "anchors.top") - return QDeclarativeAnchors::TopAnchor; + return QDeclarativeAnchors::HasTopAnchor; if (name == "anchors.left") - return QDeclarativeAnchors::LeftAnchor; + return QDeclarativeAnchors::HasLeftAnchor; if (name == "anchors.bottom") - return QDeclarativeAnchors::BottomAnchor; + return QDeclarativeAnchors::HasBottomAnchor; if (name == "anchors.right") - return QDeclarativeAnchors::RightAnchor; + return QDeclarativeAnchors::HasRightAnchor; if (name == "anchors.horizontalCenter") - return QDeclarativeAnchors::HCenterAnchor; + return QDeclarativeAnchors::HasHCenterAnchor; if (name == "anchors.verticalCenter") - return QDeclarativeAnchors::VCenterAnchor; + return QDeclarativeAnchors::HasVCenterAnchor; if (name == "anchors.baseline") - return QDeclarativeAnchors::BaselineAnchor; + return QDeclarativeAnchors::HasBaselineAnchor; Q_ASSERT_X(false, Q_FUNC_INFO, "wrong anchor name - this should never happen"); - return QDeclarativeAnchors::LeftAnchor; + return QDeclarativeAnchors::HasLeftAnchor; } QString propertyNameForAnchorLine(const QDeclarativeAnchorLine::AnchorLine &anchorLine) diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp index 8a09e0c8ab..f24bfa6673 100644 --- a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp +++ b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp @@ -64,11 +64,11 @@ QDeclarativeStateOperation::ActionList QmlPropertyChangesObject::actions() binding->setTarget(action.property); binding->setNotifyOnValueChanged(true); action.toBinding = binding; - action.toValue = binding->evaluate(); + action.toValue = binding->value(); m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding)); } else { action.toBinding = m_expressionHash[action.specifiedProperty].second.data(); - action.toValue = m_expressionHash[action.specifiedProperty].second->evaluate(); + action.toValue = m_expressionHash[action.specifiedProperty].second->value(); } } else { action.toBinding = 0; -- cgit v1.2.1