diff options
-rw-r--r-- | src/plugins/qmldesigner/core/instances/qmlgraphicsitemnodeinstance.cpp | 18 | ||||
-rw-r--r-- | src/plugins/qmldesigner/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 84c9464ef7..a467130128 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::UsedAnchor anchorLineFlagForName(const QString &name) +QDeclarativeAnchors::Anchor anchorLineFlagForName(const QString &name) { if (name == "anchors.top") - return QDeclarativeAnchors::HasTopAnchor; + return QDeclarativeAnchors::TopAnchor; if (name == "anchors.left") - return QDeclarativeAnchors::HasLeftAnchor; + return QDeclarativeAnchors::LeftAnchor; if (name == "anchors.bottom") - return QDeclarativeAnchors::HasBottomAnchor; + return QDeclarativeAnchors::BottomAnchor; if (name == "anchors.right") - return QDeclarativeAnchors::HasRightAnchor; + return QDeclarativeAnchors::RightAnchor; if (name == "anchors.horizontalCenter") - return QDeclarativeAnchors::HasHCenterAnchor; + return QDeclarativeAnchors::HCenterAnchor; if (name == "anchors.verticalCenter") - return QDeclarativeAnchors::HasVCenterAnchor; + return QDeclarativeAnchors::VCenterAnchor; if (name == "anchors.baseline") - return QDeclarativeAnchors::HasBaselineAnchor; + return QDeclarativeAnchors::BaselineAnchor; Q_ASSERT_X(false, Q_FUNC_INFO, "wrong anchor name - this should never happen"); - return QDeclarativeAnchors::HasLeftAnchor; + return QDeclarativeAnchors::LeftAnchor; } 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 f24bfa6673..8a09e0c8ab 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->value(); + action.toValue = binding->evaluate(); 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->value(); + action.toValue = m_expressionHash[action.specifiedProperty].second->evaluate(); } } else { action.toBinding = 0; |