diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:34:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:47:59 +0200 |
| commit | 8e67fb1f148b2f3c795d230faad7aee20389878a (patch) | |
| tree | 34358c0ee9ab4816d20d58d84bdab20093b1d423 /tests/auto/render/qbuffer/tst_qbuffer.cpp | |
| parent | ba5bc93b95d28a28a72e60281f765a6f031129a5 (diff) | |
| parent | d4fb24c0871320667640f100b743f34f702db6cf (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/animation/backend/channelmapper_p.h
Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
Diffstat (limited to 'tests/auto/render/qbuffer/tst_qbuffer.cpp')
| -rw-r--r-- | tests/auto/render/qbuffer/tst_qbuffer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index 5408c0474..c0d96d10b 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp @@ -112,7 +112,6 @@ private Q_SLOTS: QCOMPARE(buffer->metaObject(), creationChangeData->metaObject()); QCOMPARE(buffer->data(), cloneData.data); QCOMPARE(buffer->usage(), cloneData.usage); - QCOMPARE(buffer->type(), cloneData.type); QCOMPARE(buffer->dataGenerator(), cloneData.functor); QCOMPARE(buffer->isSyncData(), cloneData.syncData); if (buffer->dataGenerator()) { |