diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:52 +0200 |
| commit | 3df07ae0b98dabbc2b60bab162173b24b010a4ee (patch) | |
| tree | feae86b8861d717f21cbfbec6d3d044d6e4f6694 | |
| parent | 13ddb8a01f107a523047995df8cd673673f89c9e (diff) | |
| parent | d5b3a2b6e6462f4ad46fce8f52539333b131dcad (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I193713443518859b2e3bf088ddebcafe1badd7cf
| -rw-r--r-- | src/serialbus/qmodbusreply.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp index a01a606..7201a33 100644 --- a/src/serialbus/qmodbusreply.cpp +++ b/src/serialbus/qmodbusreply.cpp @@ -95,6 +95,8 @@ QModbusReply::QModbusReply(ReplyType type, int serverAddress, QObject *parent) /*! Returns \c true when the reply has finished or was aborted. + + \sa finished(), error() */ bool QModbusReply::isFinished() const { @@ -190,10 +192,14 @@ int QModbusReply::serverAddress() const Note: Do not delete this reply object in the slot connected to this signal. Use \l deleteLater() instead. + + \sa error(), errorString() */ /*! Returns the error state of this reply. + + \sa errorString(), errorOccurred() */ QModbusDevice::Error QModbusReply::error() const { |