diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:00:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:00:32 +0200 |
| commit | 7577cd3fa7ebfa35b199d485233f3b41cec79e46 (patch) | |
| tree | 4717348c3a51a9a63398987dfe19a35467244c53 | |
| parent | c55b32e89989cd8075360991371b6d8c6aba560d (diff) | |
| parent | b5c415eb612d05f7fe690eff361a616d0cabbc7e (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2
Change-Id: I0286e29c47be19444c4240c382171ab8c48be33e
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp index 077b2ec..0185544 100644 --- a/src/serialbus/qmodbusclient.cpp +++ b/src/serialbus/qmodbusclient.cpp @@ -157,8 +157,10 @@ int QModbusClient::timeout() const /*! \fn void QModbusClient::timeoutChanged(int newTimeout) - This signal is emitted if the response is not received within the required - timeout. The new response timeout for the device is passed as \a newTimeout. + This signal is emitted when the timeout used by this QModbusClient instance + is changed. The new response timeout for the device is passed as \a newTimeout. + + \sa setTimout() */ /*! @@ -172,7 +174,7 @@ int QModbusClient::timeout() const Already active/running timeouts are not affected by such timeout duration changes. - \sa timeout + \sa timeout timeoutChanged() */ void QModbusClient::setTimeout(int newTimeout) { |