Merge remote-tracking branch 'origin/5.9' into 5.105.10

 Conflicts:
	.qmake.conf

Change-Id: If12daffe4655f71d9aea39e0ed9e0db405a09fe7

4 files changed, 53 insertions, 5 deletions

diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 0000000..0f38467
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,37 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               Qt 5.9.4 Changes                           *
+****************************************************************************
+
+QtSerialBus
+------
+
+ - SocketCAN
+   * [QTBUG-64406] Fixed compiling the SocketCAN plugin with older Kernels
+     without support for CAN FD bitrate switch and error state indicator.
+
+ - TinyCAN
+   * [QTBUG-65474] Fixed compiliation with MSVC 2013
+   * The function availableDevices() now returns {"can0.0"} instead
+     {"can0.0", "can0.1"} for the TinyCAN plugin. This value is
+     hardcoded for now as available devices cannot be detected.
+     The function will be changed in later Qt versions to return the
+     correct values once QTBUG-62958 is solved.
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 14a4cde..c890fff 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -74,6 +74,13 @@ struct canfd_frame {
 
 #endif
 
+#ifndef CANFD_BRS
+#   define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
+#endif
+#ifndef CANFD_ESI
+#   define CANFD_ESI 0x02 /* error state indicator of the transmitting node */
+#endif
+
 QT_BEGIN_NAMESPACE
 
 const char sysClassNetC[] = "/sys/class/net/";
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 2d3488a..68e8bb2 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -70,7 +70,9 @@ bool TinyCanBackend::canCreate(QString *errorReason)
 
 QList<QCanBusDeviceInfo> TinyCanBackend::interfaces()
 {
-    return { createDeviceInfo(QStringLiteral("can0.0")), createDeviceInfo(QStringLiteral("can0.1")) };
+    QList<QCanBusDeviceInfo> result;
+    result.append(createDeviceInfo(QStringLiteral("can0.0")));
+    return result;
 }
 
 namespace {
diff --git a/src/serialbus/doc/src/tinycan.qdoc b/src/serialbus/doc/src/tinycan.qdoc
index 97ceabb..43349dc 100644
--- a/src/serialbus/doc/src/tinycan.qdoc
+++ b/src/serialbus/doc/src/tinycan.qdoc
@@ -53,13 +53,15 @@
 
     \code
         QCanBusDevice *device = QCanBus::instance()->createDevice(
-            QStringLiteral("tinycan"), QStringLiteral("channela"));
+            QStringLiteral("tinycan"), QStringLiteral("can0.0"));
         device->connectDevice();
     \endcode
 
-    Where \e can0.0 is the active CAN interface name. TinyCAN provides the
-    interfaces \e can0.0 and \e can0.1, which maps to INDEX_CAN_KANAL_A resp.
-    INDEX_CAN_KANAL_B in the TinyCAN plugin.
+    Where \e can0.0 is the active CAN interface name. TinyCAN currently only provides
+    the interface \e can0.0, which maps to INDEX_CAN_KANAL_A in the TinyCAN plugin.
+
+    \note The function availableDevices() currently always returns one device
+    "can0.0" as there is no way to detect the available CAN adapters for now.
 
     \note Only the USB adapters are currently supported by this plugin.