diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:59 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:14:59 +0300 |
| commit | 616bc5b962cdcacb1c1ba985d7236392e9cadb8c (patch) | |
| tree | ae9ab55d44310c59316d3f688751b7c6d072d5e0 | |
| parent | 5efce7d821bad2f5db95ff3ada5eeddccbb58920 (diff) | |
| parent | 0519e68956872c6d7b72cca7910db331bb8a9e8f (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: I87fd541a17bd4fa1ddea1065e3553579eb53baf0
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialbus/doc/src/peakcan.qdoc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 3edcad8..ffbf410 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 diff --git a/src/serialbus/doc/src/peakcan.qdoc b/src/serialbus/doc/src/peakcan.qdoc index a38ddf7..b9a7f4f 100644 --- a/src/serialbus/doc/src/peakcan.qdoc +++ b/src/serialbus/doc/src/peakcan.qdoc @@ -36,7 +36,8 @@ This plugin requires the PCAN device drivers and the PCAN-Basic library version 4.0.0 or higher on Windows (pcanbasic.dll) and Linux (libpcanbasic.so). On macOS the plugin requires the PCBUSB library from - \l{http://www.mac-can.com}{UV Software}. + \l{http://www.mac-can.com}{UV Software}. For Qt versions from 5.14 up to + 6.4 (both including), only PCBUSB version 0.8.1 is supported. \section1 Creating CAN Bus Devices |