Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	dependencies.yaml

Change-Id: I234bfebfbf805f9a5a5acebeac1a8413902c809d

10 files changed, 16 insertions, 17 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 07d90b8..e62fae5 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.7")
+set(QT_REPO_MODULE_VERSION "6.2.8")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 0b659f3..c20e4d4 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.7
+MODULE_VERSION = 6.2.8
diff --git a/dependencies.yaml b/dependencies.yaml
index 5b5b636..7310db3 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   ../tqtc-qtbase:
-    ref: 694575a59b5370afc494fbf700eee8db1d1ec091
+    ref: 67934c103800bae50c2ec1977758d40fa8e4e507
     required: true
   ../tqtc-qtserialport:
-    ref: c41c1c113e6d93198d15b72406a8c6954a11051a
+    ref: e724de41a550dd67651942b6e28207e6e8f86f72
     required: false
diff --git a/src/serialbus/doc/src/peakcan.qdoc b/src/serialbus/doc/src/peakcan.qdoc
index c10263b..51e8a26 100644
--- a/src/serialbus/doc/src/peakcan.qdoc
+++ b/src/serialbus/doc/src/peakcan.qdoc
@@ -36,7 +36,8 @@
     This plugin requires the PCAN device drivers and the PCAN-Basic library
     version 4.4.0 or higher on Windows (pcanbasic.dll) resp. 4.0.0 on Linux
     (libpcanbasic.so). On macOS the plugin requires the PCBUSB library from
-    \l{http://www.mac-can.com}{UV Software}.
+    \l{http://www.mac-can.com}{UV Software}. For Qt versions from 5.14 up to
+    6.4 (both including), only PCBUSB version 0.8.1 is supported.
 
     \note QCanBusDeviceInfo::alias() is only supported on Windows and with
         PCAN-Basic 4.4.0 or higher.
diff --git a/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc b/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
index cf591cf..0e071a4 100644
--- a/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
+++ b/src/serialbus/doc/src/qtserialbus-module-cpp.qdoc
@@ -31,6 +31,7 @@
     \title Qt Serial Bus C++ Classes
     \ingroup modules
     \qtvariable serialbus
+    \qtcmakepackage SerialBus
     \since 5.8
 
     \brief Provides classes to read and write serial bus data.
diff --git a/src/serialbus/qcanbusdeviceinfo.cpp b/src/serialbus/qcanbusdeviceinfo.cpp
index b808009..b163938 100644
--- a/src/serialbus/qcanbusdeviceinfo.cpp
+++ b/src/serialbus/qcanbusdeviceinfo.cpp
@@ -141,7 +141,7 @@ QString QCanBusDeviceInfo::serialNumber() const
 
     \note In contrast to serialNumber(), the alias is not guaranteed to be unique.
 
-    If that function is not supported by the CAN plugin, an empty string is returned.
+    If this function is not supported by the CAN plugin, an empty string is returned.
     \sa serialNumber()
 */
 QString QCanBusDeviceInfo::alias() const
diff --git a/src/serialbus/qcanbusframe.cpp b/src/serialbus/qcanbusframe.cpp
index 206eb90..0f1349a 100644
--- a/src/serialbus/qcanbusframe.cpp
+++ b/src/serialbus/qcanbusframe.cpp
@@ -443,7 +443,7 @@ QString QCanBusFrame::toString() const
 /*! \relates QCanBusFrame
 
     Writes a \a frame to the stream (\a out) and returns a reference
-    to the it.
+    to it.
 */
 QDataStream &operator<<(QDataStream &out, const QCanBusFrame &frame)
 {
@@ -466,7 +466,7 @@ QDataStream &operator<<(QDataStream &out, const QCanBusFrame &frame)
 /*! \relates QCanBusFrame
 
     Reads a \a frame from the stream (\a in) and returns a
-    reference to the it.
+    reference to it.
 */
 QDataStream &operator>>(QDataStream &in, QCanBusFrame &frame)
 {
diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp
index a2bfdd6..9888ae7 100644
--- a/src/serialbus/qmodbusreply.cpp
+++ b/src/serialbus/qmodbusreply.cpp
@@ -83,7 +83,7 @@ public:
 /*!
     Constructs a QModbusReply object with a given \a type and the specified \a parent.
 
-    The reply will be send to the Modbus client represented by
+    The reply will be sent to the Modbus client represented by
     \a serverAddress.
 */
 QModbusReply::QModbusReply(ReplyType type, int serverAddress, QObject *parent)
@@ -149,7 +149,7 @@ void QModbusReply::setFinished(bool isFinished)
     request then the returned \l QModbusDataUnit instance is invalid.
 
     \note If the \l type() of the reply is \l QModbusReply::Broadcast, the
-    return value will always be invalid. If the l type() of the reply is
+    return value will always be invalid. If the \l type() of the reply is
     \l QModbusReply::Raw, the return value might be invalid depending on the
     implementation of \l QModbusClient::processPrivateResponse().
 
diff --git a/src/serialbus/qmodbustcpserver.cpp b/src/serialbus/qmodbustcpserver.cpp
index 3a15e9e..ca2e871 100644
--- a/src/serialbus/qmodbustcpserver.cpp
+++ b/src/serialbus/qmodbustcpserver.cpp
@@ -131,7 +131,9 @@ void QModbusTcpServer::close()
     if (d->m_tcpServer->isListening())
         d->m_tcpServer->close();
 
-    for (auto socket : qAsConst(d->connections))
+    const auto childSockets =
+            d->m_tcpServer->findChildren<QTcpSocket *>(QString(), Qt::FindDirectChildrenOnly);
+    for (auto socket : childSockets)
         socket->disconnectFromHost();
 
     setState(QModbusDevice::UnconnectedState);
diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h
index 3e8ca62..0250f52 100644
--- a/src/serialbus/qmodbustcpserver_p.h
+++ b/src/serialbus/qmodbustcpserver_p.h
@@ -132,17 +132,13 @@ public:
                 return;
             }
 
-            connections.append(socket);
-
             auto buffer = new QByteArray();
 
-            QObject::connect(socket, &QObject::destroyed, q, [buffer]() {
+            QObject::connect(socket, &QObject::destroyed, socket, [buffer]() {
                 // cleanup buffer
                 delete buffer;
             });
             QObject::connect(socket, &QTcpSocket::disconnected, q, [socket, this]() {
-                connections.removeAll(socket);
-
                 Q_Q(QModbusTcpServer);
                 emit q->modbusClientDisconnected(socket);
                 socket->deleteLater();
@@ -226,7 +222,6 @@ public:
     }
 
     QTcpServer *m_tcpServer { nullptr };
-    QList<QTcpSocket *> connections;
 
     std::unique_ptr<QModbusTcpConnectionObserver> m_observer;