diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:05:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:05:33 +0200 |
| commit | f12d420e8492b85e8aa2a7982e81a88cb1098d6c (patch) | |
| tree | 617fd7a88752742fb9f5bf349087100e390d1a22 /src | |
| parent | a88ecda86028228174a1ec4e53df235ebac33dcc (diff) | |
| parent | 562113342f2b232d38a3ea05e84b8d2584799218 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I563668f100ffd7e39e94f109642b7d51b6b9a135
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp index d273a3a..56a1ab5 100644 --- a/src/serialbus/qmodbusclient.cpp +++ b/src/serialbus/qmodbusclient.cpp @@ -165,7 +165,7 @@ int QModbusClient::timeout() const /*! Sets the \a newTimeout for this QModbusClient instance. The minimum timeout - is 50 ms. + is 10 ms. The timeout is used by the client to determine how long it waits for a response from the server. If the response is not received within the @@ -178,7 +178,7 @@ int QModbusClient::timeout() const */ void QModbusClient::setTimeout(int newTimeout) { - if (newTimeout < 50) + if (newTimeout < 10) return; Q_D(QModbusClient); |