diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 05:30:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 05:30:18 (GMT) |
| commit | 8c6f2fdf09eb2998cb013659ca7a2154792ffa98 (patch) | |
| tree | c13bb27adf01e18cd3a8313343af9b2321b2dd61 /tests | |
| parent | dc7385b41bf81e6c12dbd3c33c2bea577e067970 (diff) | |
| parent | 160f1867868cdea916923652b00484ed11f90aaa (diff) | |
| download | Qt-8c6f2fdf09eb2998cb013659ca7a2154792ffa98.zip Qt-8c6f2fdf09eb2998cb013659ca7a2154792ffa98.tar.gz Qt-8c6f2fdf09eb2998cb013659ca7a2154792ffa98.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve Flickable dynamics and allow platform specific tweaking.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index d499edf..4fa1cb3 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -110,7 +110,7 @@ void tst_qdeclarativeflickable::create() QCOMPARE(obj->isInteractive(), true); QCOMPARE(obj->boundsBehavior(), QDeclarativeFlickable::DragAndOvershootBounds); QCOMPARE(obj->pressDelay(), 0); - QCOMPARE(obj->maximumFlickVelocity(), 2000.); + QCOMPARE(obj->maximumFlickVelocity(), 2500.); delete obj; } |