diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:58 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:58 +0200 |
| commit | 9c129775f17c58876ad97f258c5f15d24d1b16b1 (patch) | |
| tree | c1830977967f0ea82a2d26cec106a533e3a2ddfc /tests | |
| parent | f51c9010772e86d92740ed73ebae00567d980715 (diff) | |
| parent | f787689e74dee63c55f2731683a4ede752fd9e44 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I5d8d370a4da0a155914cd0e07610a1dcbd737f67
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp index 63307913b..6be039108 100644 --- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp @@ -733,7 +733,7 @@ void tst_QVideoFrame::mapImage() QVERIFY(frame.map(mode)); QVERIFY(frame.bits()); - QCOMPARE(frame.mappedBytes(), image.byteCount()); + QCOMPARE(qsizetype(frame.mappedBytes()), image.sizeInBytes()); QCOMPARE(frame.bytesPerLine(), image.bytesPerLine()); QCOMPARE(frame.mapMode(), mode); |