diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:39:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:46:20 +0100 |
| commit | 246799d8a7bf42c1f22fca7ef6d77e8d58054bad (patch) | |
| tree | a0b92a804d7d2a30cd68fa327df5777d8bcc36ba /tests/auto/corelib/animation/qpropertyanimation | |
| parent | 5ad191850becd7dc1d61d0975f141a5db64e6373 (diff) | |
| parent | 02cc57f4edbae450ecfa8368052afa44f8aeee19 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
examples/network/network-chat/peermanager.cpp
src/widgets/util/qsystemtrayicon.cpp
src/widgets/util/qsystemtrayicon_qpa.cpp
src/widgets/util/qsystemtrayicon_win.cpp
src/widgets/util/qsystemtrayicon_x11.cpp
Change-Id: I1c026df83818c0ccaf956980370e7522960627db
Diffstat (limited to 'tests/auto/corelib/animation/qpropertyanimation')
| -rw-r--r-- | tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 9e0648d194..cf4c4e1bdb 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -441,10 +441,8 @@ void tst_QPropertyAnimation::noStartValue() a.setDuration(250); a.start(); - QTest::qWait(300); - - QTRY_COMPARE(o.values.first(), 42); - QCOMPARE(o.values.last(), 420); + QTRY_COMPARE(o.values.value(o.values.size() - 1, -1), 420); + QCOMPARE(o.values.first(), 42); } void tst_QPropertyAnimation::noStartValueWithLoop() |