Merge remote-tracking branch 'gerrit/5.7' into dev

Change-Id: I5202af1faa3b92018747b38fe54524cc712d2f43

1 files changed, 16 insertions, 2 deletions

diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 3266d79..198ee33 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -44,6 +44,7 @@
 
 #include <QCanBusFrame>
 #include <QCanBus>
+#include <QCloseEvent>
 #include <QTimer>
 
 #include <QtCore/qbytearray.h>
@@ -146,8 +147,15 @@ void MainWindow::connectDevice()
 
         m_ui->sendMessagesBox->setEnabled(true);
 
-        showStatusMessage(tr("Backend: %1, Connected to: %2")
-                          .arg(p.backendName).arg(p.deviceInterfaceName));
+        QVariant bitRate = m_canDevice->configurationParameter(QCanBusDevice::BitRateKey);
+        if (bitRate.isValid()) {
+            showStatusMessage(tr("Backend: %1, connected to %2 at %3 kBit/s")
+                    .arg(p.backendName).arg(p.deviceInterfaceName)
+                    .arg(bitRate.toInt() / 1000));
+        } else {
+            showStatusMessage(tr("Backend: %1, connected to %2")
+                    .arg(p.backendName).arg(p.deviceInterfaceName));
+        }
     }
 }
 
@@ -173,6 +181,12 @@ void MainWindow::framesWritten(qint64 count)
     qDebug() << "Number of frames written:" << count;
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    m_connectDialog->close();
+    event->accept();
+}
+
 void MainWindow::checkMessages()
 {
     if (!m_canDevice)