Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/serialbus/qmodbusrtuserialmaster_p.h

Change-Id: Ib7b6b93816942837203d922992ee4b55f27bfec5

1 files changed, 14 insertions, 1 deletions

diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index 7495832..1c3ba43 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -71,7 +71,8 @@ ConnectDialog::ConnectDialog(QWidget *parent) :
 
     connect(m_ui->speedBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &ConnectDialog::checkCustomSpeedPolicy);
-
+    connect(m_ui->backendListBox, &QComboBox::currentTextChanged,
+            this, &ConnectDialog::backendChanged);
     m_ui->rawFilterEdit->hide();
     m_ui->rawFilterLabel->hide();
 
@@ -102,6 +103,18 @@ void ConnectDialog::checkCustomSpeedPolicy(int idx)
     }
 }
 
+void ConnectDialog::backendChanged(const QString &backend)
+{
+    if (backend == QStringLiteral("generic"))
+        m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0"));
+    else if (backend == QStringLiteral("peakcan"))
+        m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("usbbus1"));
+    else if (backend == QStringLiteral("socketcan"))
+        m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("can0"));
+    else if (backend == QStringLiteral("tinycan"))
+        m_ui->interfaceNameEdit->setPlaceholderText(QStringLiteral("channela"));
+}
+
 void ConnectDialog::ok()
 {
     updateSettings();