summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-165-4/+21
|\| |
| * | Fix various QDoc warnings/errors in QtSerialBusv5.12.0-beta3Alex Blasche2018-10-155-4/+21
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-082-4/+6
|\| |
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2Qt Forward Merge Bot2018-10-061-3/+5
| |\|
| | * Modbus: Fix documentation for QModbusClient::timeoutChanged()Andre Hartmann2018-10-021-3/+5
| * | Update condition for WebAssembly platform to new nameEskil Abrahamsen Blomfeldt2018-10-051-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-185-15/+39
|\| |
| * | Doc: Fix \code usagev5.12.0-beta1Topi Reinio2018-09-131-1/+3
| * | QCanBusDevice: Don't return a bool value from clear()Andre Hartmann2018-09-133-14/+12
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\|
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| | |/
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-111-0/+1
|\| |
| * | Add missing Q_DECLARE_OPERATORS_FOR_FLAGS(QCanBusDevice::Directions)Andre Hartmann2018-09-101-0/+1
|/ /
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-08-175-21/+55
|\|
| * Doc: Improve plugin overview pagesAndre Hartmann2018-08-095-23/+57
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-072-9/+10
|\|
| * Doc: add missing since to enum QCanBusDevice::DataBitRateKeyAndre Hartmann2018-08-061-0/+1
| * Update LICENSE.FDLSamuli Piippo2018-08-011-9/+9
* | Add a virtual CAN bus pluginAndre Hartmann2018-08-018-0/+690
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\|
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
* | Prepare for introduction of WebAssemblyEskil Abrahamsen Blomfeldt2018-06-281-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-2/+27
|\|
| * Migrate the modbus example to use QRegularExpressionSamuel Gaist2018-06-201-2/+3
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| |/
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+5038
|\|
| * Add binary compatibility file for QtSerialBus for 5.11Milla Pohjanheimo2018-06-051-0/+5038
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-043-1/+53
|\|
| * Add changes file for Qt 5.9.6Andre Hartmann2018-06-041-0/+28
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| * tst_qmodbusclient: Fix inconsistent overridesFriedemann Kleint2018-05-301-1/+1
* | PeakCAN: Fix Clang warning about sign conversionAndre Hartmann2018-05-181-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-124-27/+76
|\|
| * Modernize CAN bus exampleAndre Hartmann2018-05-111-1/+1
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-093-26/+75
| |\
| | * Fix compilation with MSVC 2017v5.11.0-rc2v5.11.0Thiago Macieira2018-05-092-26/+22
| | * Add changes file for Qt 5.11.0v5.11.0-rc1Antti Kokko2018-04-231-0/+53
| |/
* | Add configuration options to canbusutilAndre Hartmann2018-04-173-0/+52
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-074-7/+5
|\|
| * Improve QCanBusDeviceInfo documentationv5.11.0-beta4v5.11.0-beta3Andre Hartmann2018-04-032-1/+3
| * Doc: Remove last remaining \since < Qt 5.8Andre Hartmann2018-04-032-6/+2
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-275-14/+14
|\|
| * Doc: Fix documentation warningsTopi Reinio2018-03-265-14/+14
* | QCanBusDevice: Simplify d-ptr usageAndre Hartmann2018-03-231-3/+3
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-201-1/+1
|\|
| * VectorCAN: Fix receiving frames with multiple open channelsAndre Hartmann2018-03-191-1/+1