diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:07:57 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:07:57 +0100 |
| commit | f7bd3d0654540f20fad7babd010cc0e233c95986 (patch) | |
| tree | 6ee414a710d15e7896cfd4d566fb29984a12a97c | |
| parent | bd9cb9215095e4095bf5de96e4b2ce260fa14afc (diff) | |
| parent | 2eb972216c649296f8e0afbc055e94f8240ad770 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib31fd9fcaafb120ba85bc56cf1829c7fba1ef1b7
| -rw-r--r-- | dist/changes-5.14.1 | 20 | ||||
| -rw-r--r-- | examples/serialbus/can/mainwindow.h | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 0000000..d008638 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,20 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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. + + - This release contains only minor code improvements. diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h index 2e910d1..9c3f9ca 100644 --- a/examples/serialbus/can/mainwindow.h +++ b/examples/serialbus/can/mainwindow.h @@ -51,7 +51,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QCanBusDevice> // for CanBusError +#include <QCanBusDevice> #include <QMainWindow> |