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

Change-Id: Iadf16ca1ce1209d0cc86a0e45f45e377f4d76f0e

5 files changed, 10 insertions, 9 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 6f32ba4..07d90b8 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.6")
+set(QT_REPO_MODULE_VERSION "6.2.7")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index a709427..0b659f3 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.6
+MODULE_VERSION = 6.2.7
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 16d158c..44b3cce 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,4 +1,5 @@
 version: 2
+alias: qtserialbus
 accept_configuration:
   condition: property
   property: features
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 298d80a..c9aef31 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -117,7 +117,7 @@ void MainWindow::initActionsConnections()
     connect(m_ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
     connect(m_ui->actionClearLog, &QAction::triggered, m_model, &ReceivedFramesModel::clear);
     connect(m_ui->actionPluginDocumentation, &QAction::triggered, this, []() {
-        QDesktopServices::openUrl(QUrl("http://doc.qt.io/qt-5/qtcanbus-backends.html#can-bus-plugins"));
+        QDesktopServices::openUrl(QUrl("http://doc.qt.io/qt-6/qtcanbus-backends.html#can-bus-plugins"));
     });
 }
 
@@ -150,7 +150,7 @@ void MainWindow::connectDevice()
                                                         &errorString));
     if (!m_canDevice) {
         m_status->setText(tr("Error creating device '%1', reason: '%2'")
-                          .arg(p.pluginName).arg(errorString));
+                          .arg(p.pluginName, errorString));
         return;
     }
 
@@ -186,16 +186,16 @@ void MainWindow::connectDevice()
                     m_canDevice->configurationParameter(QCanBusDevice::DataBitRateKey);
             if (isCanFd && dataBitRate.isValid()) {
                 m_status->setText(tr("Plugin: %1, connected to %2 at %3 / %4 kBit/s")
-                                  .arg(p.pluginName).arg(p.deviceInterfaceName)
+                                  .arg(p.pluginName, p.deviceInterfaceName)
                                   .arg(bitRate.toInt() / 1000).arg(dataBitRate.toInt() / 1000));
             } else {
                 m_status->setText(tr("Plugin: %1, connected to %2 at %3 kBit/s")
-                                  .arg(p.pluginName).arg(p.deviceInterfaceName)
+                                  .arg(p.pluginName, p.deviceInterfaceName)
                                   .arg(bitRate.toInt() / 1000));
             }
         } else {
             m_status->setText(tr("Plugin: %1, connected to %2")
-                    .arg(p.pluginName).arg(p.deviceInterfaceName));
+                    .arg(p.pluginName, p.deviceInterfaceName));
         }
 
         if (m_canDevice->hasBusStatus())
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp
index bf7ae44..4b64b92 100644
--- a/src/serialbus/qcanbusdevice.cpp
+++ b/src/serialbus/qcanbusdevice.cpp
@@ -400,8 +400,8 @@ QVariant QCanBusDevice::configurationParameter(ConfigurationKey key) const
 /*!
     Returns the list of keys used by the CAN bus connection.
 
-    The the meaning of the keys is equivalent to \l ConfigurationKey.
-    If a key is not explicitly mentioned the platform's
+    The meaning of the keys is equivalent to \l ConfigurationKey.
+    If a key is not explicitly mentioned, the platform's
     default setting for the relevant key is used.
 */
 QList<QCanBusDevice::ConfigurationKey> QCanBusDevice::configurationKeys() const