summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/animations
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-10 00:23:18 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-10 00:23:18 (GMT)
commit80cc666f4f3c7cc2fc6aed806951564066011e09 (patch)
tree5a1de23f1e6eb9d8b9a483310922942fb3acd262 /tests/auto/declarative/animations
parentfc5fd47fc7e7d87d17386e23690af4fec80dae05 (diff)
downloadQt-80cc666f4f3c7cc2fc6aed806951564066011e09.zip
Qt-80cc666f4f3c7cc2fc6aed806951564066011e09.tar.gz
Qt-80cc666f4f3c7cc2fc6aed806951564066011e09.tar.bz2
Fix animation tests.
Diffstat (limited to 'tests/auto/declarative/animations')
-rw-r--r--tests/auto/declarative/animations/tst_animations.cpp6
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));
}