diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:20 +0100 |
| commit | aef65fb80fc60909ac5141f2df1f9918f964528c (patch) | |
| tree | 86067237c10a12f10195b94ca099ef326fb282b1 /src | |
| parent | 6cb07fb512082bac7df5b50048d7ade111b575e0 (diff) | |
| parent | c8fe92ef54b2d310e8c8c143962fd6f43bf46c27 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I34693c3a4b342b1a5b30b5adc4af34f67fccb8b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialbus/qmodbusserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialbus/qmodbusserver.cpp b/src/serialbus/qmodbusserver.cpp index 1a16347..c9e661c 100644 --- a/src/serialbus/qmodbusserver.cpp +++ b/src/serialbus/qmodbusserver.cpp @@ -1254,7 +1254,7 @@ QModbusResponse QModbusServerPrivate::processEncapsulatedInterfaceTransportReque objectData[1] = quint8(object.size()); objectData += object; if (payload.size() + objectData.size() > 253) { - payload[3] = quint8(0xff); // more follows + payload[3] = char(0xff); // more follows payload[4] = id; // next object id break; } |