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, 4 insertions, 4 deletions

diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp
index 2b01ad6..32a3b43 100644
--- a/src/serialbus/qmodbuspdu.cpp
+++ b/src/serialbus/qmodbuspdu.cpp
@@ -555,18 +555,18 @@ int QModbusRequest::calculateDataSize(const QModbusRequest &request)
     case QModbusPdu::WriteMultipleCoils:
         minimum -= 1; // first payload payload byte
         if (request.dataSize() >= minimum)
-            size = minimum + request.data()[minimum - 1] /*byte count*/;
+            size = minimum + quint8(request.data()[minimum - 1]) /*byte count*/;
         break;
     case QModbusPdu::WriteMultipleRegisters:
     case QModbusPdu::ReadWriteMultipleRegisters:
         minimum -= 2; // first 2 payload payload bytes
         if (request.dataSize() >= minimum)
-            size = minimum + request.data()[minimum - 1] /*byte count*/;
+            size = minimum + quint8(request.data()[minimum - 1]) /*byte count*/;
         break;
     case QModbusPdu::ReadFileRecord:
     case QModbusPdu::WriteFileRecord:
         if (request.dataSize() >= 1)
-            size = 1 /*byte count*/ + request.data()[0] /*actual bytes*/;
+            size = 1 /*byte count*/ + quint8(request.data()[0]) /*actual bytes*/;
         break;
     case QModbusPdu::EncapsulatedInterfaceTransport: {
         if (request.dataSize() < minimum)
@@ -710,7 +710,7 @@ int QModbusResponse::calculateDataSize(const QModbusResponse &response)
     case QModbusResponse::ReadWriteMultipleRegisters:
     case QModbusResponse::ReportServerId:
         if (response.dataSize() >= 1)
-            size = 1 /*byte count*/ + response.data()[0] /*actual bytes*/;
+            size = 1 /*byte count*/ + quint8(response.data()[0]) /*actual bytes*/;
         break;
     case QModbusResponse::ReadFifoQueue: {
         if (response.dataSize() >= 2) {