summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativedom
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@nokia.com>2010-07-14 04:06:57 (GMT)
committerLorn Potter <lorn.potter@nokia.com>2010-07-14 04:06:57 (GMT)
commit423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch)
tree35e27c69dee1d96775f4a921e93f5cd2e574a834 /tests/auto/declarative/qdeclarativedom
parenta9b6c59857c28f48e093abccaf9a89755b0995bc (diff)
parent444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff)
downloadQt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip
Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz
Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2
Merge branch '4.7' of ../oslo-staging-1 into 4.7
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());