diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:12:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-16 09:47:42 +0100 |
| commit | 23ef4bab1faa867ba3614f0b5a325dc3a91550a1 (patch) | |
| tree | c1f776ad4792bb8e3ce3688f509cb47cadbd006c /src/serialbus/qmodbusrtuserialmaster_p.h | |
| parent | a31a7e0b2b7b3de3e1867ad954ac7fad9531cc99 (diff) | |
| parent | 498b1424ce273beed02c5e1c93ed0ffd610624b8 (diff) | |
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
Diffstat (limited to 'src/serialbus/qmodbusrtuserialmaster_p.h')
| -rw-r--r-- | src/serialbus/qmodbusrtuserialmaster_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h index e7e9a92..c698ebc 100644 --- a/src/serialbus/qmodbusrtuserialmaster_p.h +++ b/src/serialbus/qmodbusrtuserialmaster_p.h @@ -216,8 +216,9 @@ public: QObject::connect(m_serialPort, &QSerialPort::aboutToClose, q, [this]() { Q_Q(QModbusRtuSerialMaster); - if (q->state() != QModbusDevice::ClosingState) - q->close(); + Q_UNUSED(q); // To avoid unused variable warning in release mode + Q_ASSERT(q->state() == QModbusDevice::ClosingState); + m_sendTimer.stop(); m_responseTimer.stop(); }); |