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

Conflicts:
	src/serialbus/qmodbusrtuserialmaster_p.h

Change-Id: Ib7b6b93816942837203d922992ee4b55f27bfec5

4 files changed, 20 insertions, 4 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();
diff --git a/examples/serialbus/can/connectdialog.h b/examples/serialbus/can/connectdialog.h
index 7a46c86..f04f554 100644
--- a/examples/serialbus/can/connectdialog.h
+++ b/examples/serialbus/can/connectdialog.h
@@ -76,6 +76,7 @@ public:
 
 private slots:
     void checkCustomSpeedPolicy(int idx);
+    void backendChanged(const QString &backend);
     void ok();
     void cancel();
 
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index fe63911..a04a0f4 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -116,7 +116,7 @@ void MainWindow::connectDevice()
 
     m_canDevice = QCanBus::instance()->createDevice(p.backendName.toLocal8Bit(), p.deviceInterfaceName);
     if (!m_canDevice) {
-        showStatusMessage(tr("Connection error"));
+        showStatusMessage(tr("Error creating device: %1").arg(p.backendName));
         return;
     }
 
@@ -133,10 +133,10 @@ void MainWindow::connectDevice()
     }
 
     if (!m_canDevice->connectDevice()) {
+        showStatusMessage(tr("Connection error: %1").arg(m_canDevice->errorString()));
+
         delete m_canDevice;
         m_canDevice = nullptr;
-
-        showStatusMessage(tr("Connection error"));
     } else {
         m_ui->actionConnect->setEnabled(false);
         m_ui->actionDisconnect->setEnabled(true);
diff --git a/examples/serialbus/modbus/adueditor/plaintextedit.h b/examples/serialbus/modbus/adueditor/plaintextedit.h
index 1a0d8e3..8eeaf8f 100644
--- a/examples/serialbus/modbus/adueditor/plaintextedit.h
+++ b/examples/serialbus/modbus/adueditor/plaintextedit.h
@@ -72,7 +72,9 @@ public:
     {
         QMenu menu(this);
         menu.addAction(QStringLiteral("Clear"), this, &QPlainTextEdit::clear);
+#ifndef QT_NO_CLIPBOARD
         menu.addAction(QStringLiteral("Copy"), this, &QPlainTextEdit::copy, QKeySequence::Copy);
+#endif
         menu.addSeparator();
         menu.addAction(QStringLiteral("Select All"), this, &QPlainTextEdit::selectAll,
             QKeySequence::SelectAll);