summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativedom
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-07-09 04:07:31 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-07-18 04:22:06 (GMT)
commit953eeb0eeebb27d440e002cf4c3620b87bbe43d5 (patch)
tree99da6ffbb7376f60651ad6fd6be056237ddfd592 /tests/auto/declarative/qdeclarativedom
parent57dcaf349dbfd4494b15bb8465b277792eb739bb (diff)
downloadQt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.zip
Qt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.tar.gz
Qt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.tar.bz2
Make test pass and fix docs following removal of SpringFollow
(cherry picked from commit 31cd8c15c0fdb2f08c2652609a57413a715d1b13)
Diffstat (limited to 'tests/auto/declarative/qdeclarativedom')
-rw-r--r--tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index 13960b1..5028ba1 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -279,7 +279,7 @@ void tst_qdeclarativedom::loadComposite()
void tst_qdeclarativedom::testValueSource()
{
QByteArray qml = "import Qt 4.7\n"
- "Rectangle { SpringFollow on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
+ "Rectangle { SpringAnimation on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
QDeclarativeEngine freshEngine;
QDeclarativeDomDocument document;
@@ -295,7 +295,7 @@ void tst_qdeclarativedom::testValueSource()
QDeclarativeDomObject valueSourceObject = valueSource.object();
QVERIFY(valueSourceObject.isValid());
- QVERIFY(valueSourceObject.objectType() == "Qt/SpringFollow");
+ QVERIFY(valueSourceObject.objectType() == "Qt/SpringAnimation");
const QDeclarativeDomValue springValue = valueSourceObject.property("spring").value();
QVERIFY(!springValue.isInvalid());