diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:38:46 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:38:46 (GMT) |
| commit | ee958684bd1273a5140e1f6d1264bf8bb7d62ef1 (patch) | |
| tree | c3b95bb906483b14dd9a58098b18b82b9d9010c2 /tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp | |
| parent | efc80209fb5e6ac9d0343b3c9f6d5a1548cf5556 (diff) | |
| parent | 9753f6098e0e5b3d80ac748559aecc2e66dcfc7a (diff) | |
| download | Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.zip Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.tar.gz Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
Diffstat (limited to 'tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp index 7a60e78..8a07d6b 100644 --- a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp +++ b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp @@ -72,7 +72,7 @@ void tst_qdeclarativespringfollow::defaultValues() QVERIFY(obj != 0); - QCOMPARE(obj->sourceValue(), 0.); + QCOMPARE(obj->to(), 0.); QCOMPARE(obj->velocity(), 0.); QCOMPARE(obj->spring(), 0.); QCOMPARE(obj->damping(), 0.); @@ -94,7 +94,7 @@ void tst_qdeclarativespringfollow::values() QVERIFY(obj != 0); - QCOMPARE(obj->sourceValue(), 1.44); + QCOMPARE(obj->to(), 1.44); QCOMPARE(obj->velocity(), 0.9); QCOMPARE(obj->spring(), 1.0); QCOMPARE(obj->damping(), 0.5); @@ -117,7 +117,7 @@ void tst_qdeclarativespringfollow::disabled() QVERIFY(obj != 0); - QCOMPARE(obj->sourceValue(), 1.44); + QCOMPARE(obj->to(), 1.44); QCOMPARE(obj->velocity(), 0.9); QCOMPARE(obj->spring(), 1.0); QCOMPARE(obj->damping(), 0.5); |