Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
index 24d9c7409e..3dd4b5114c 100644
--- a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
+++ b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
@@ -269,7 +269,7 @@ void tst_QCborStreamReader::integers()
     quint64 absolute = (isNegative ? expectedRaw + 1 : expectedRaw);
 
     QBuffer buffer(&data);
-    QCborStreamReader reader(data);
+    QCborStreamReader reader(useDevice ? QByteArray() : data);
     if (useDevice) {
         buffer.open(QIODevice::ReadOnly);
         reader.setDevice(&buffer);
@@ -605,7 +605,7 @@ void tst_QCborStreamReader::fixed()
     removeIndicators(expected);
 
     QBuffer buffer(&data);
-    QCborStreamReader reader(data);
+    QCborStreamReader reader(useDevice ? QByteArray() : data);
     if (useDevice) {
         buffer.open(QIODevice::ReadOnly);
         reader.setDevice(&buffer);