diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-08 11:13:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-08 11:13:00 +0200 |
| commit | ee80f7127cf33ba91c99130dd556f4931acaf8e5 (patch) | |
| tree | 4717348c3a51a9a63398987dfe19a35467244c53 | |
| parent | 882ae7c5964d412d2cbf2e19f54a75b76a0bc328 (diff) | |
| parent | 7577cd3fa7ebfa35b199d485233f3b41cec79e46 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I709a8b631ef03ce32b5befaad953e1e98f316c58
| -rw-r--r-- | qtserialbus.pro | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qtserialbus.pro b/qtserialbus.pro index 24f8f05..6261f9f 100644 --- a/qtserialbus.pro +++ b/qtserialbus.pro @@ -1,4 +1,4 @@ -requires(qtHaveModule(serialport):!html5) +requires(qtHaveModule(serialport):!wasm) lessThan(QT_MAJOR_VERSION, 5) { message("Cannot build current QtSerialBus sources with Qt version $${QT_VERSION}.") 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) { |