diff options
author | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:51:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:51:50 +0200 |
commit | 8e43d9ef9939144eddd4eb4c8442f05a827f3344 (patch) | |
tree | 7e0c748176a4f87405f6f560ec0f836d489eff09 /examples/serialbus | |
parent | 960861ac561f4bd4d8ce4fbe6d0643482d961f11 (diff) | |
parent | fe80eef6b3377c8727c5190d275808c343ee7c75 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
examples/serialbus/modbus/adueditor/modbustcpclient_p.h
Change-Id: I620bfce752a957fdcd068c44ff039d84b7502edc
Diffstat (limited to 'examples/serialbus')
-rw-r--r-- | examples/serialbus/modbus/adueditor/modbustcpclient_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h index a563b6f..c4a1c13 100644 --- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h +++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h @@ -97,7 +97,7 @@ public: q->connect(q, &QModbusClient::timeoutChanged, element.timer.data(), QOverload<int>::of(&QTimer::setInterval)); - q->connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() { + QObject::connect(element.timer.data(), &QTimer::timeout, q, [this, writeToSocket]() { if (!m_transactionStore.contains(m_tId)) return; |