Commit 4f016abb authored by Kai Koehne's avatar Kai Koehne
Browse files

Compile fix (API changes in qt-qml)

parent 8cd3b67a
...@@ -437,32 +437,32 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name) ...@@ -437,32 +437,32 @@ void QmlGraphicsItemNodeInstance::resetProperty(const QString &name)
// qmlGraphicsItem()->anchors()->setVerticalCenterOffset(anchors.margin(AnchorLine::VerticalCenter)); // qmlGraphicsItem()->anchors()->setVerticalCenterOffset(anchors.margin(AnchorLine::VerticalCenter));
//} //}
QDeclarativeAnchors::UsedAnchor anchorLineFlagForName(const QString &name) QDeclarativeAnchors::Anchor anchorLineFlagForName(const QString &name)
{ {
if (name == "anchors.top") if (name == "anchors.top")
return QDeclarativeAnchors::HasTopAnchor; return QDeclarativeAnchors::TopAnchor;
if (name == "anchors.left") if (name == "anchors.left")
return QDeclarativeAnchors::HasLeftAnchor; return QDeclarativeAnchors::LeftAnchor;
if (name == "anchors.bottom") if (name == "anchors.bottom")
return QDeclarativeAnchors::HasBottomAnchor; return QDeclarativeAnchors::BottomAnchor;
if (name == "anchors.right") if (name == "anchors.right")
return QDeclarativeAnchors::HasRightAnchor; return QDeclarativeAnchors::RightAnchor;
if (name == "anchors.horizontalCenter") if (name == "anchors.horizontalCenter")
return QDeclarativeAnchors::HasHCenterAnchor; return QDeclarativeAnchors::HCenterAnchor;
if (name == "anchors.verticalCenter") if (name == "anchors.verticalCenter")
return QDeclarativeAnchors::HasVCenterAnchor; return QDeclarativeAnchors::VCenterAnchor;
if (name == "anchors.baseline") if (name == "anchors.baseline")
return QDeclarativeAnchors::HasBaselineAnchor; return QDeclarativeAnchors::BaselineAnchor;
Q_ASSERT_X(false, Q_FUNC_INFO, "wrong anchor name - this should never happen"); 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) QString propertyNameForAnchorLine(const QDeclarativeAnchorLine::AnchorLine &anchorLine)
......
...@@ -64,11 +64,11 @@ QDeclarativeStateOperation::ActionList QmlPropertyChangesObject::actions() ...@@ -64,11 +64,11 @@ QDeclarativeStateOperation::ActionList QmlPropertyChangesObject::actions()
binding->setTarget(action.property); binding->setTarget(action.property);
binding->setNotifyOnValueChanged(true); binding->setNotifyOnValueChanged(true);
action.toBinding = binding; action.toBinding = binding;
action.toValue = binding->value(); action.toValue = binding->evaluate();
m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding)); m_expressionHash.insert(action.specifiedProperty, ExpressionPair(m_expressionHash[action.specifiedProperty].first, binding));
} else { } else {
action.toBinding = m_expressionHash[action.specifiedProperty].second.data(); 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 { } else {
action.toBinding = 0; action.toBinding = 0;
......
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