diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-02 13:40:39 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-02 13:40:39 +0200 |
| commit | e6b723273336770e6ff7ca6539ea0e170e50d5e8 (patch) | |
| tree | 1e2741876f2b7a91da026e502839b75078699fc9 | |
| parent | 0dcf46c54bc0b987ef516710887d441c2f3ed4ec (diff) | |
| parent | b3612f9f99f442861240316066a6b5d918d5c966 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into tqtc/lts-6.2-opensource
Change-Id: I05138bcbfa2c021db89125879e7c0504c7a965a4
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusclient.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 940e347..6f32ba4 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.5") +set(QT_REPO_MODULE_VERSION "6.2.6") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 8fcb369..a709427 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.5 +MODULE_VERSION = 6.2.6 diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp index d3e1cb2..a883aa9 100644 --- a/src/serialbus/qmodbusclient.cpp +++ b/src/serialbus/qmodbusclient.cpp @@ -129,7 +129,7 @@ QModbusReply *QModbusClient::sendReadWriteRequest(const QModbusDataUnit &read, fits inside the Modbus PDU data section and has a valid function code. The only check performed before sending is therefore the validity check, see \l QModbusPdu::isValid. If no error occurred the function returns a - a new valid \l QModbusReply; nullptr otherwise. Modbus networks may have + new valid \l QModbusReply; nullptr otherwise. Modbus networks may have multiple servers, each server has a unique \a serverAddress. \sa QModbusReply::rawResult() |