Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/plugins/canbus/peakcan/main.cpp
	src/plugins/canbus/tinycan/main.cpp
	src/serialbus/qcanbusframe.h

Change-Id: I7a38350688086b5f5cd7072acccb3fa38af76f88

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp b/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
index 592a14e..f442344 100644
--- a/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
+++ b/tests/auto/qmodbuspdu/tst_qmodbuspdu.cpp
@@ -844,6 +844,25 @@ private slots:
         });
         QCOMPARE(QModbusRequest::calculateDataSize(request), 27);
     }
+
+    void testCalculateLongDataSize()
+    {
+        QByteArray longData = QByteArray(128, ' ');
+        longData[0] = longData.size();
+        const QModbusResponse response(QModbusResponse::ReadCoils, longData);
+        QCOMPARE(QModbusResponse::calculateDataSize(response), 1 + longData.size());
+
+        const QModbusRequest wfrRequest(QModbusPdu::WriteFileRecord, longData);
+        QCOMPARE(QModbusRequest::calculateDataSize(wfrRequest), 1 + longData.size());
+
+        longData = QByteArray(4 + 128, ' ');
+        longData[4] = 128;
+        const QModbusRequest wmcRequest(QModbusPdu::WriteMultipleCoils, longData);
+        QCOMPARE(QModbusRequest::calculateDataSize(wmcRequest), 1 + longData.size());
+
+        const QModbusRequest wmrRequest(QModbusPdu::WriteMultipleRegisters, longData);
+        QCOMPARE(QModbusRequest::calculateDataSize(wmrRequest), 1 + longData.size());
+    }
 };
 
 QTEST_MAIN(tst_QModbusPdu)