diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:39 +0200 |
| commit | 34d346c161bf89a6a98d4782627a5c4f12271bde (patch) | |
| tree | 86b58f149855b4a4266b3e22bbf86ea6dbf21e11 | |
| parent | 13d7ca49093a2b7d60ccee703c0d45542e4990de (diff) | |
| parent | 609104101cd859013097831c393a7cf422b18e03 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I49dff945874682d5443dd886f89f6cad8aca4680
| -rw-r--r-- | LICENSE.FDL | 18 | ||||
| -rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 1 |
2 files changed, 10 insertions, 9 deletions
diff --git a/LICENSE.FDL b/LICENSE.FDL index 086177c..938bb8d 100644 --- a/LICENSE.FDL +++ b/LICENSE.FDL @@ -400,19 +400,19 @@ public wiki that anybody can edit is an example of such a server. A "Massive Multiauthor Collaboration" (or "MMC") contained in the site means any set of copyrightable works thus published on the MMC site. -"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 -license published by Creative Commons Corporation, a not-for-profit -corporation with a principal place of business in San Francisco, -California, as well as future copyleft versions of that license +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license published by that same organization. -"Incorporate" means to publish or republish a Document, in whole or in +"Incorporate" means to publish or republish a Document, in whole or in part, as part of another Document. -An MMC is "eligible for relicensing" if it is licensed under this -License, and if all works that were first published under this License -somewhere other than this MMC, and subsequently incorporated in whole or -in part into the MMC, (1) had no cover texts or invariant sections, and +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and (2) were thus incorporated prior to November 1, 2008. The operator of an MMC Site may republish an MMC contained in the site diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index a89df64..4484225 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -116,6 +116,7 @@ Q_LOGGING_CATEGORY(QT_CANBUS, "qt.canbus") CAN FD allows to transmit the payload of frames with \l QCanBusFrame::hasBitrateSwitch() flag at a higher data bitrate, after the arbitration phase at the nominal bitrate is finished. + This enum value was introduced in Qt 5.9. See also \c QCanBusDevice::BitRateKey \value UserKey This key defines the range where custom keys start. Its most common purpose is to permit platform-specific configuration |