diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 03:01:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 03:01:36 +0100 |
| commit | d0e0119251288c9c7224c5c6797a1377032aac2f (patch) | |
| tree | eb2fa404470833cf4b94847594d250dcf1ec01fc /tests/auto/unit | |
| parent | 46ac981d28240f93af02e4459d9ce02f294c2ab8 (diff) | |
| parent | 2a888bc3fb72069e735faad42e8325f60a5d7412 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3
Change-Id: I3a719b4e4ba75da1784fb2bc5d6c014b1e6c54ac
Diffstat (limited to 'tests/auto/unit')
| -rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index bf8704162..f1d5cc327 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -297,10 +297,6 @@ void tst_QMediaObject::notifySignals() timer.start(); QTRY_COMPARE(spy.count(), count); - - qint64 elapsed = timer.elapsed(); - int expectedElapsed = count * interval * 3; // give it some margin of error - QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData()); } void tst_QMediaObject::notifyInterval_data() |