diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:59:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:59:26 +0200 |
| commit | f78db81a49228d663e8fb913af36e97ba3325e51 (patch) | |
| tree | 8d0ca081817fa8050a94c6c574e4d0ef466122c7 | |
| parent | d59e2a4b72154b64e1d26fd1068933b8a25da77b (diff) | |
| parent | 54b0df52e64d7fa7f2b34b9a190129977a2859a3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
| -rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusdevice.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index e3964da..9256bc8 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -343,6 +343,7 @@ bool QCanBusDevice::hasOutgoingFrames() const } /*! + * \since 5.14 * Called from the derived plugin to register a function that performs the * CAN controller hardware reset when \a resetController() is called. */ @@ -354,6 +355,7 @@ void QCanBusDevice::setResetControllerFunction(std::function<void()> &resetter) } /*! + * \since 5.14 * Called from the derived plugin to register a function that returns the * CAN controller bus status when \a busStatus() is called. */ diff --git a/src/serialbus/qmodbusdevice.cpp b/src/serialbus/qmodbusdevice.cpp index fbfdbcd..ab8e126 100644 --- a/src/serialbus/qmodbusdevice.cpp +++ b/src/serialbus/qmodbusdevice.cpp @@ -337,7 +337,7 @@ QString QModbusDevice::errorString() const } /*! - \since 5.13 + \since 5.14 Returns the underlying \l QIODevice used for ModBus communication or \c nullptr if the device was not yet fully initialized. |