summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 11:01:55 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-18 11:01:55 +0100
commit81b1ae518792a9c1a2417c3a05b87eb5dc7ebc13 (patch)
treea4d9cacd785a1f35a5071bf1a739830f810e5ca9
parent1b263f6a56c14e04e92310998303d8f815dba8f8 (diff)
parent6e3e86f947fcbdf19cfad5d9cc6407f3a9e3f51e (diff)
Merge remote-tracking branch 'origin/5.9.4' into 5.9
-rw-r--r--dist/changes-5.9.419
1 files changed, 14 insertions, 5 deletions
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
index 9280979..0f38467 100644
--- a/dist/changes-5.9.4
+++ b/dist/changes-5.9.4
@@ -21,8 +21,17 @@ information about a particular change.
* Qt 5.9.4 Changes *
****************************************************************************
-SocketCAN
----------
-
- - [QTBUG-64406] Fixed compiling the SocketCAN plugin with older Kernels
- without support for CAN FD bitrate switch and error state indicator.
+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.