diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:14:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:34:45 +0200 |
| commit | eba0e3f243da949789871c3884c0ba158a3f6948 (patch) | |
| tree | e43188227c7f82c579a15ae7c1029940a79a7e18 /src/serialbus/qmodbuspdu.cpp | |
| parent | e704a83b4a1a1eb69b62ee2cb029c549d99959ed (diff) | |
| parent | 94c64856be9af05d8459ad9fc16e6c95baa2c737 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/serialbus/qmodbusrtuserialmaster_p.h
Change-Id: Ib7b6b93816942837203d922992ee4b55f27bfec5
Diffstat (limited to 'src/serialbus/qmodbuspdu.cpp')
| -rw-r--r-- | src/serialbus/qmodbuspdu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp index 7e09743..d6e1ef9 100644 --- a/src/serialbus/qmodbuspdu.cpp +++ b/src/serialbus/qmodbuspdu.cpp @@ -723,7 +723,7 @@ int QModbusResponse::calculateDataSize(const QModbusResponse &response) if (response.dataSize() < minimum) break; // can't calculate, let's return -1 to indicate error - quint8 meiType; + quint8 meiType = 0; response.decodeData(&meiType); // update size, header 6 bytes: mei type + read device id + conformity level + more follows |