summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+24
|\ | | | | | | Change-Id: Ie4f37f4cde0acea0c746684ebe883175e00b29d9
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+24
| |\ | | | | | | | | | Change-Id: I6dac68349e9b5418dc828eb985b8b3b0a5cae702
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I802d2ba7a946df4cb002ab227c674a221c117eb3
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ab6f188bf00a9572804baa7b788536247ce88626 Bump version + 245f9f299a3503fa9acc54517fa9bd541366d7cc Generic(V1): Fix emitting framesReceived when disconnected + b63877157c2c9681ced1efbfefe1d2d1debf812e CAN-Example: Fix two issues with the status timer Change-Id: Ibf4ccb7070c14577e242ca13c4b254c415c665ba Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | | Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+36
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + d59e2a4b72154b64e1d26fd1068933b8a25da77b Bump version + 2eb972216c649296f8e0afbc055e94f8240ad770 CAN Example: Remove now outdated comment + 421dad73cc993f2af4573a709607690feb28729b VectorCAN: Add support for using CAN FD + a3aa54e27094b80feae4e42c5f7e22c3d4022b49 PeakCAN: Init API structs without memset + 25ca4c9aba7f3bcc8c59b622990d1becc9293ac8 Init API structs without memset + 6e275b20911fc3e5af2a1b972ec3550235250157 PeakCAN: Fix Clang warning on Windows + 16817cba8720797f20c6d8e638614356d909529b SocketCAN: Fix compile with old Linux Kernels + 1a893e24a96d9a276b68f6ae9baee9f86f885d2c QAbstractSocket: Fix warnings from deprecated error signal + 42da962b67b4af36a9930b447e0bbef417a646a0 VirtualCAN: Add missing framesWritten() emission + 153d66980c45a69398e0d6ef5f7736c5c1e3490c SocketCAN: Virtual CAN devices don't have bus status Change-Id: I736d8324865f28fe88c681e20709adab35869112 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3Qt Forward Merge Bot2020-03-311-0/+1
|\| | | | | | | | | | | Change-Id: If4bc20fe1f799d5904cc80593994e9d880c950c4
| * | VirtualCAN: Add missing framesWritten() emissionAndre Hartmann2020-03-261-0/+1
| |/ | | | | | | | | | | | | | | | | | | [ChangeLog][VirtualCAN] Added the missing emission of the framesWritten() signal to writeFrame(). Fixes: QTBUG-83044 Change-Id: I3f278519f8076a9bf638bed5565464a92b97abf7 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | SocketCAN: Virtual CAN devices don't have bus statusAndre Hartmann2020-03-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | At least libsocketcan does not provide a bus status for those. This patch prevents that CAN Example requests the status every two seconds. [ChangeLog][SocketCAN] QCanBusDevice::hasBusStatus() now returns false for virtual CAN devices. Change-Id: I214dfb320c999bb00c8ae93ddc9253efbe721969 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QAbstractSocket: Fix warnings from deprecated error signalMårten Nordheim2020-03-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82605 Change-Id: I89d1a08451127c8dc1522c91a5b4e992b4ca5878 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | SocketCAN: Fix compile with old Linux KernelsAndre Hartmann2020-03-192-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h:91:5: error: ‘canfd_frame’ does not name a type That was already fixed earlier in 96d291cb, but broken again by e23f4ced. Fixes: QTBUG-82814 Change-Id: I8bfc4168165cf8e266b89e8327f88f862cf1b348 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-03-071-3/+6
|\| | | | | | | Change-Id: I7e181efc5b004eb2bcf951c011861abd258cd700
| * Port from deprecated std::is_pod to is_trivial + is_standard_layoutMarc Mutz2020-03-061-3/+6
| | | | | | | | | | | | | | | | The std::is_pod trait is deprecated in C++20; is_trivial and is_standard_layout exist since C++11. Change-Id: I81610c85df059d398b1f7094a037c4e28dfcc41f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-294-25/+37
|\| | | | | | | Change-Id: Ie5256b216ed3c9d212b3a713c1d46c9275a4d139
| * CAN-Example: Fix two issues with the status timerAndre Hartmann2020-02-272-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix a crash when device open fails If opening of m_canDevice failed, m_canDevice is reset to nullptr in line 154. Dereferencing that leads to a crash. 2. Avoid connecting multiple slots to status timer Opening and closing multiple times lead to multiple connections of the lambda slot, which triggered the call to m_canDevice->busStatus() unnecessarily often. The solution is to do the connection only once, and stop the timer when m_canDevice becomes nullptr. It is started again after a successful open. Amends f83587a9978bd212d [ChangeLog][Examples] Fixed a crash in CAN-Example when opening the CAN bus device failed. Change-Id: I4d19f382593fa26fa3b8166f7121e7ff14fd2e74 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Generic(V1): Fix emitting framesReceived when disconnectedAndre Hartmann2020-02-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one of these plugins was used in the CAN-Example, the frames received slot was still called after disconnecting. That made the example stuck and emitting lots of "Cannot read frame as device is not connected." messages. This is mostly relevant for developers though, as these plugins are not deployed. Change-Id: I675518148f4bf37f11911dd7a0f6423ae18be19d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Fix Clang warning on WindowsAndre Hartmann2020-02-261-2/+2
| | | | | | | | | | | | | | | | GetLastError() return DWORD aka unsigned long, while qt_error_string takes an int. Change-Id: Ie0c543645c149a9714cdedfdd2ec39b5959fedb8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Init API structs without memsetAndre Hartmann2020-02-244-35/+19
| | | | | | | | | | | | | | | | Continuation of a3aa54e Change-Id: Ic6daa7a754f3c869094770ea3e47a097bf4afa84 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | PeakCAN: Init API structs without memsetv5.15.0-beta1Andre Hartmann2020-02-191-13/+6
| | | | | | | | | | Change-Id: I1efaf60109d17a370662ca2b57c20ac76a9fe523 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | VectorCAN: Add support for using CAN FDAndy Shaw2020-02-134-80/+346
| | | | | | | | | | | | | | | | [ChangeLog][VectorCAN] Added CAN FD support to the VectorCAN plugin. Change-Id: I7e72dafd13bb16b2db636a133502f0bdbc7a2ba6 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ica2020409c12e3ed47bd1af0c9221b5af6c15559
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I90d2ac260bfbe0d784bd2ce9caf193f7f98be38f
* | CAN Example: Remove now outdated commentAndre Hartmann2020-01-301-1/+1
| | | | | | | | | | | | | | | | We also use QCanBusDevice in the header now. Change-Id: I3dfc54050164e5b1a5fe0d9b9bfa0ca84b1456c4 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I5b31d1bdaafa8acf367dddbacdde7955647816df
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I6a1c12fa5f9cd5c4edd5826ed1830df788957e9d
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-101-0/+20
| |/ | | | | | | | | | | | | | | | | + e333d015458b579768ca229918a3ed426f0e4029 CAN Example: Don't destroy QCanBusDevice after disconnect + 2c78116029792012410accedfc38a68c7dc30e1b Add binary compatibility file for qtserialbus 5.14 branch + 8da7dfc8544db58645354419054680c69caa207a Bump version Change-Id: I296ec083a3fafe00b088e01406ff6d34acddcd3d Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+5526
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia16e3e479f46b3208bea629ba464ec0a0620b583
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I1a08507ef5434b3d80d65688458f8fd19b639872
| * Add binary compatibility file for qtserialbus 5.14 branchMilla Pohjanheimo2019-12-161-0/+5526
| | | | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: I1026ada6cac92800e0041e3b443fb880a5ab43b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-161-0/+54
|\| | | | | | | Change-Id: I248ac13820c8461c936c3a1a7c51631f773cc939
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+54
| |\ | | | | | | | | | Change-Id: I37372bd2579f2374703852f9421d86cbbedde1c7
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+54
| | | | | | | | | | | | | | | | | | Change-Id: If0d648cdb84300ed5d6a173f9769e7ccb1f41469 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-232-13/+14
|\| | | | | | | | | | | Change-Id: I673b99b5427f5c850f3ff571189ed92537547d6a
| * | CAN Example: Don't destroy QCanBusDevice after disconnectAndre Hartmann2019-11-212-13/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code could already called the destructor of the CAN plugin while the disconnect process was still running. Using deleteLater() does not help much here, e.g. the VirtualCAN plugin needs to send "disconnect" packets and then close the TCP connection afterwards. By using a unique_ptr we can keep the object alive until the program ends or the connection dialog is opened to set up a new connection. By this delay and the usage of deleteLater(), the plugin has enough time to properly shut down. Change-Id: I9e992a4b954acd82d62d058000d2108d975b1e9c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-163-7/+8
|\| | | | | | | Change-Id: I9e2f19f2aead5f20f70497e8c049130653e60acc
| * VirtualCAN: Remove superfluous setting to closing stateAndre Hartmann2019-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Because that is already done in QCanBusDevice::disconnectDevice() before calling this private implementation. Add a logging entry instead. Change-Id: I4b7e4ba31a49e2a80d92e8dc0f24a8065d465f3a Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * VirtualCAN: Fix disconnecting from busAndre Hartmann2019-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the client sent a disconnect command to the server, this was not handled on server side. Thus, the client was never really Unconnected and in turn it was not possible to connect again. Fix that by closing the socket, that leads to VirtualCanBackend::clientDisconnected() being called and that sets the plugin to Unconnected. In any case, the server keeps running until the plugin is unloaded, even after the last client is disconnected. [ChangeLog][VirtualCAN] Fixed that the plugin stayed forever in closing state and subsequent connect calls always failed. Change-Id: I7a490c55a3cb6bd193ba4783b48d1385aa85bcde Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Doc: Fix documentation warningsTopi Reinio2019-11-132-6/+6
| | | | | | | | | | | | | | | | | | Fix several instances of incorrect parameter documentation, and one incorrect \sa link. Fixes: QTBUG-79831 Change-Id: Idefb514488adb3909e09d624a5b84b579fd4e71b Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+25
|\| | | | | | | Change-Id: I4a88277ee8a6fe43cd3fbd3f1c1b5df435cd1cb5
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+25
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I272b8caf0eb4398c66871e68a9d89bd7ec493c3a
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+26
| | |\ | | | | | | | | | | | | Change-Id: Ife381db1ca9e4529ba6c56e7d7e793c44eb03253
| | | * Add changes file for Qt 5.13.2v5.13.2Antti Kokko2019-10-161-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 7e8ad7f0bb43a3235fbf8e099e853ec3e2ce8a25 Binary compatibility file for Qt5.13.0 fr QtSerialBus + c8645af35accdfadfa2b29cd897f77b6e15704c8 Add changes file for Qt 5.12.5 + 80144b89ca1adede0db9d6e485037f5e431216c3 CAN: Avoid symbol clashes on static builds Change-Id: I6caa1947145e81be5f68c539c7b8d45a13e55466 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2ea2a93df1a960529e0449fad167f1e4e06a0620
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-023-20/+20
|\| | | | | | | | | | | | | | | Change-Id: I8d20fa09ab9668e2d18da269771de39257769ea5
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-263-20/+20
| |\| | | | | | | | | | | | | | Change-Id: I49240ebad0b08b728783a4e5137f12799cb5080c
| | * | Avoid conflicting class names if the plugins are linked staticallyAndy Shaw2019-10-223-20/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtSerialBus is already using QtSerialPort which has a WriteNotifier and ReadNotifier class in place. Therefore it is possible that if these were linked in together into one application that there would be multiple instances of the same class name which caused problems as it would think that the WriteNotifier in QtSerialPort was a QTimer and not a QSocketNotifier. So keep the names unique to be on the safe side. Change-Id: I8667e3d4230b316d47e266ad1b4319cf5e74444b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-018-8/+8
|\| | | | | | | | | | | Change-Id: I3a9c5ff32f8adb914471e865a7ce55e3028c0ee1
| * | 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
| |/| | | | |/ | | | | | | Change-Id: I35dad8a57ea003c7d70f03651aa0604141c8b2db
| | * CAN: Avoid symbol clashes on static buildsAndre Hartmann2019-09-238-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the same function name in a global namespace can lead the linker to pick an arbitrary one instead the right one. [ChangeLog] Fixed problems on static builds where an arbitrary version of resolveSymbol() was used instead the correct one. Fixes: QTBUG-78546 Change-Id: I0ff9bc3e5905b3b9694dfe9d446b2a52700f213f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-244-3/+55
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 18:15:31 +0000