diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:27:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:30:08 +0100 |
| commit | d3a2d9c96994c56d67467c131b8f080510d1a8fd (patch) | |
| tree | 088c55da965b1fb6bb327b2821afc4755eab8117 /tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
| parent | 75b4283fb05d07fb8654e031f266e9918f1ae647 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
Diffstat (limited to 'tests/auto/unit/qmediaobject/tst_qmediaobject.cpp')
| -rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 0548d1e1a..d2b43c56d 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -299,7 +299,7 @@ void tst_QMediaObject::notifySignals() QTRY_COMPARE(spy.count(), count); qint64 elapsed = timer.elapsed(); - int expectedElapsed = count * interval * 1.3; // give it some margin of error + int expectedElapsed = count * interval * 1.5; // give it some margin of error QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData()); } |