summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+24
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+24
| |\
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+24
| | |\
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+24
* | | | Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+36
|/ / /
* | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3Qt Forward Merge Bot2020-03-311-0/+1
|\ \ \ | |/ /
| * | VirtualCAN: Add missing framesWritten() emissionAndre Hartmann2020-03-261-0/+1
| |/
* | SocketCAN: Virtual CAN devices don't have bus statusAndre Hartmann2020-03-271-0/+3
* | QAbstractSocket: Fix warnings from deprecated error signalMÃ¥rten Nordheim2020-03-231-1/+1
* | SocketCAN: Fix compile with old Linux KernelsAndre Hartmann2020-03-192-24/+24
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-03-071-3/+6
|\ \ | |/
| * Port from deprecated std::is_pod to is_trivial + is_standard_layoutMarc Mutz2020-03-061-3/+6
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-294-25/+37
|\ \ | |/
| * CAN-Example: Fix two issues with the status timerAndre Hartmann2020-02-272-23/+33
| * Generic(V1): Fix emitting framesReceived when disconnectedAndre Hartmann2020-02-272-2/+4
* | PeakCAN: Fix Clang warning on WindowsAndre Hartmann2020-02-261-2/+2
* | Init API structs without memsetAndre Hartmann2020-02-244-35/+19
* | PeakCAN: Init API structs without memsetv5.15.0-beta1Andre Hartmann2020-02-191-13/+6
* | VectorCAN: Add support for using CAN FDAndy Shaw2020-02-134-80/+346
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/
| * Bump versionAlexandru Croitor2020-02-021-1/+1
* | CAN Example: Remove now outdated commentAndre Hartmann2020-01-301-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-101-0/+20
| |/
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+5526
|\ \ | |/
| * Bump versionDaniel Smith2019-12-161-1/+1
| * Add binary compatibility file for qtserialbus 5.14 branchMilla Pohjanheimo2019-12-161-0/+5526
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-161-0/+54
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+54
| |\
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+54
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-232-13/+14
|\ \ \ | |/ /
| * | CAN Example: Don't destroy QCanBusDevice after disconnectAndre Hartmann2019-11-212-13/+14
| |/
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-163-7/+8
|\ \ | |/
| * VirtualCAN: Remove superfluous setting to closing stateAndre Hartmann2019-11-151-1/+1
| * VirtualCAN: Fix disconnecting from busAndre Hartmann2019-11-151-0/+1
| * Doc: Fix documentation warningsTopi Reinio2019-11-132-6/+6
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+25
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+25
| |\
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+26
| | |\
| | | * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-161-0/+25
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-023-20/+20
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-263-20/+20
| |\ \ \ | | |/ /
| | * | Avoid conflicting class names if the plugins are linked staticallyAndy Shaw2019-10-223-20/+20
| | |/
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-018-8/+8
|\ \ \ | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1Qt Forward Merge Bot2019-09-248-8/+8
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-248-8/+8
| | |\ \ | |/ / / | | | _
| | * CAN: Avoid symbol clashes on static buildsAndre Hartmann2019-09-238-8/+8
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-244-3/+55
|\ \ \