summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-302-5/+26
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-232-5/+26
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-232-5/+26
| |/| | | | |/
| | * Doc: Add precision to QCanBusFrame::setFrameId descriptionPaul Wicking2019-07-221-3/+9
| | * PeakCAN: Update documentation for added CAN FD functionsAndre Hartmann2019-07-181-2/+17
* | | QCanBusDevice: Rewrap documentationAndre Hartmann2019-07-291-3/+4
* | | SocketCAN: Allow specifying the protocol to useAndre Hartmann2019-07-245-1/+20
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-231-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-231-0/+1
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-161-0/+1
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-161-0/+1
| |/| | | | |/
| | * SocketCAN: Fix compiler error "‘SIOCGSTAMP’ was not declared"Andre Hartmann2019-07-091-0/+1
* | | QModBusPdu: Fix old-style and downcast compiler warningsAndre Hartmann2019-07-222-10/+10
* | | Add QCanBusDevice::busStatus()Andre Hartmann2019-07-1723-2/+346
* | | CanBusUtil: Add local echo to flags columnAndre Hartmann2019-07-165-17/+22
* | | Systec: Fix some compiler and code model cast warningsAndre Hartmann2019-07-162-6/+6
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\|
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ /
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
|/| | | | |/ /
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | Modbus: Use QOverload instead home-brewed castingAndre Hartmann2019-07-032-6/+5
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+29
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+29
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+29
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+29
| |/| | | | |/
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+30
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+30
| | |/|
| | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-281-0/+29
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
* | | | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-252-2/+2
* | | | Fix Qt6 buildSona Kurazyan2019-06-249-31/+31
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+40
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+40
|/| | | | | |/ / /
| * | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+40
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+40
| |/| | |
| | * | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-191-0/+40
* | | | | Deprecate the 'UserParameter' enum valueKarsten Heimrich2019-06-073-6/+6
* | | | | Expose the underling QIODevice used for Modbus communicationKarsten Heimrich2019-06-077-1/+25
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-111-1/+2
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-111-1/+2
|/| | | | | | |/ / / /
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-081-1/+2
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-1/+2
| |/| | | | | | | |/ / | | |/| |
| | * | | Android: disable tests requiring pluginsAlex Blasche2019-05-081-1/+2
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-181-1/+1
|\| | |
| * | | QModBusReply: Fix typo in documentationAndre Hartmann2019-05-151-1/+1
| | |/ | |/|