Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I9e2f19f2aead5f20f70497e8c049130653e60acc

3 files changed, 8 insertions, 7 deletions

diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp
index 0057d9f..a7e23ff 100644
--- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp
+++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp
@@ -139,6 +139,7 @@ void VirtualCanServer::readyRead()
             QStringList list = interfaces.toStringList();
             list.removeAll(command.mid(int(strlen("disconnect:"))));
             readSocket->setProperty("interfaces", list);
+            readSocket->disconnectFromHost();
 
         } else {
             const QByteArrayList commandList = command.split(':');
@@ -218,7 +219,7 @@ bool VirtualCanBackend::open()
 
 void VirtualCanBackend::close()
 {
-    setState(ClosingState);
+    qCDebug(QT_CANBUS_PLUGINS_VIRTUALCAN, "Client [%p] sends disconnect to server.", this);
 
     m_clientSocket->write("disconnect:can" + QByteArray::number(m_channel) + '\n');
 }
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp
index 222f19c..5b6c343 100644
--- a/src/serialbus/qcanbusdevice.cpp
+++ b/src/serialbus/qcanbusdevice.cpp
@@ -346,8 +346,8 @@ 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.
+ * Called from the derived plugin to register a function \a resetter which performs the
+ * CAN controller hardware reset when resetController() is called.
  */
 void QCanBusDevice::setResetControllerFunction(std::function<void()> resetter)
 {
@@ -358,8 +358,8 @@ 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.
+ * Called from the derived plugin to register a function \a busStatusGetter
+ * which returns the CAN controller bus status when busStatus() is called.
  */
 void QCanBusDevice::setCanBusStatusGetter(std::function<CanBusStatus()> busStatusGetter)
 {
@@ -559,7 +559,7 @@ bool QCanBusDevice::hasBusStatus() const
     The function hasBusStatus() can be used at runtime to check if
     the used CAN plugin has support for requesting the CAN bus status.
 
-    \sa hasBusStatus(), hardwareControllerReset()
+    \sa hasBusStatus(), resetController()
 */
 QCanBusDevice::CanBusStatus QCanBusDevice::busStatus() const
 {
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp
index c62539e..1476314 100644
--- a/src/serialbus/qcanbusframe.cpp
+++ b/src/serialbus/qcanbusframe.cpp
@@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE
     \a newFrameId with more than 11 bits in size is given.
 
     When the format is extended and a \a newFrameId with up to 11 bits or less
-    is passed, the \e {CAN extended frame format} setting is \a not changed.
+    is passed, the \e {CAN extended frame format} setting is \b not changed.
 
     \sa frameId(), hasExtendedFrameFormat()
 */