diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-10 00:32:48 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-10 00:32:48 (GMT) |
| commit | 4abf24ebe42a0c048f0f9e3468f47efb1d5d535a (patch) | |
| tree | 64377f91ccdf0888d2f1b88f2ca1f5ec5c830e4f /tests/auto | |
| parent | c99661bb07af4838d3d26dcd6332587985edc7f4 (diff) | |
| parent | 80cc666f4f3c7cc2fc6aed806951564066011e09 (diff) | |
| download | Qt-4abf24ebe42a0c048f0f9e3468f47efb1d5d535a.zip Qt-4abf24ebe42a0c048f0f9e3468f47efb1d5d535a.tar.gz Qt-4abf24ebe42a0c048f0f9e3468f47efb1d5d535a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/animations/tst_animations.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp index a4402cb..372658e 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -134,7 +134,7 @@ void tst_animations::dotProperty() animation.setProperty("border.width"); animation.setTo(10); animation.start(); - QTest::qWait(animation.duration()); + QTest::qWait(animation.duration()+50); QTIMED_COMPARE(rect.border()->width(), 10); rect.border()->setWidth(0); @@ -352,7 +352,7 @@ void tst_animations::propertiesTransition() QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect"); QVERIFY(myRect); - QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition4.qml:22:9) targets/properties/exclude and target/property are mutually exclusive."); + QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition4.qml:22:9) matchTargets/matchProperties/exclude and target/property are mutually exclusive."); rect->setState("moved"); QCOMPARE(myRect->x(),qreal(200)); } @@ -365,7 +365,7 @@ void tst_animations::propertiesTransition() QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect"); QVERIFY(myRect); - QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition5.qml:22:9) targets/properties/exclude and target/property are mutually exclusive."); + QTest::ignoreMessage(QtWarningMsg, "QML QmlNumberAnimation (file:///home/brasser/depot/kinetic-declarativeui/qt/tests/auto/declarative/animations/data/propertiesTransition5.qml:22:9) matchTargets/matchProperties/exclude and target/property are mutually exclusive."); rect->setState("moved"); QCOMPARE(myRect->x(),qreal(200)); } |