summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-23 03:00:48 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-23 03:00:48 +0200
commitc9b9d9ed19566aa6e0a6d6a54bd2e4b819c8c48b (patch)
tree2708b066445bf5fe1e9565b5b46b1bb4a2437f38
parent43a65b661f54755eb725e25112d62cb5eb726ac3 (diff)
parent864e4a8ab514ddcd7f79106a6b447f7a1d5b5d4e (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
-rw-r--r--src/serialbus/qmodbusrtuserialmaster_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index 770a39b..9a75de5 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -265,9 +265,11 @@ public:
}
void scheduleNextRequest() {
+ Q_Q(QModbusRtuSerialMaster);
+
m_state = Schedule;
m_serialPort->clear(QSerialPort::AllDirections);
- QTimer::singleShot(m_interFrameDelayMilliseconds, [this]() { processQueue(); });
+ QTimer::singleShot(m_interFrameDelayMilliseconds, q, [this]() { processQueue(); });
}
QModbusReply *enqueueRequest(const QModbusRequest &request, int serverAddress,