From 3cb0cf51319910a0e39fc6affd8f507e553e80ed Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 20 Aug 2009 16:42:03 +1000 Subject: Rename Follow property followValue -> value. --- src/declarative/QmlChanges.txt | 2 +- src/declarative/util/qmlfollow.cpp | 2 +- src/declarative/util/qmlfollow.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 1897adc..7fb1a5f 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -25,6 +25,7 @@ Text elements: hAlign -> horizontalAlignment Text elements: vAlign -> verticalAlignment State: operations -> changes Transition: operations -> animations +Follow: followValue -> value Additions: MouseRegion: add "acceptedButtons" property @@ -54,7 +55,6 @@ RunScript -> StateChangeScript SetAnchors -> AnchorChanges Renamed properties: -Follow: followValue -> value Transition: fromState -> from Trnasition: toState -> to diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index c48684b..eec2480 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -410,7 +410,7 @@ void QmlFollow::setMass(qreal mass) } /*! - \qmlproperty qreal Follow::followValue + \qmlproperty qreal Follow::value The current value. */ diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h index 5c1093e..07b2f49 100644 --- a/src/declarative/util/qmlfollow.h +++ b/src/declarative/util/qmlfollow.h @@ -66,7 +66,7 @@ class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource, Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon) Q_PROPERTY(qreal modulus READ modulus WRITE setModulus) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) - Q_PROPERTY(qreal followValue READ value NOTIFY valueChanged) + Q_PROPERTY(qreal value READ value NOTIFY valueChanged) Q_PROPERTY(qreal modulus READ modulus WRITE setModulus NOTIFY modulusChanged) Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged) Q_PROPERTY(bool inSync READ inSync NOTIFY syncChanged) -- cgit v0.12