summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* 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>
* 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>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I90d2ac260bfbe0d784bd2ce9caf193f7f98be38f
* 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>
* 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.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>
* | 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>
* 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.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.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 "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>
* | Fix the last Clazy level 2 warningsAndre Hartmann2019-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ./qtserialbus/src/tools/canbusutil/readtask.cpp line 71: view = QString::fromLatin1("%1.%2 ") => QString::fromLatin1() being passed a literal line 77: QString flags = QLatin1String("- - "); => QString(QLatin1String) being called Change-Id: I69a655a2fe58652aa54fd706706400663a40e997 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | CanBusUtil: Fix crash on listening without argumentsAndre Hartmann2019-09-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The listening option expects two parameters: plugin and device. But it was possible to call the program without or with only one parameter, which lead to a crash in util.start(args.at(0), args.at(1), data). Fix that by always checking the argument size first. Change-Id: I7c49bfc875f99286e1f04d1d4ef23b7971577363 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+50
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+50
|/| | | |/ | | | | Change-Id: I33897a3bb6b2708791441c488668d21f7f624af7
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+30
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+30
| |/| | | | | | | | | | Change-Id: I353abe2c835e5c6b724d5c27ba0e5647d0290acc
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+30
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+30
| | |/| | | | | | | | | | | | | Change-Id: Ie654b8e12d7d121f0a081bc97da2810c96cd2028
| | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-09-041-0/+30
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a49336c78a0b610b2dff25ecc1f292bdeefbfda7 Android: disable tests requiring plugins + 1dda855cfc82db70fd937b1c33f9af57482a5d43 Bump version + 43d746c2c0c87c8694e835f3b052317c8fa02482 SocketCAN: Fix compiler error "‘SIOCGSTAMP’ was not declared" + dd9b3d7ee62019d75764be7e49468976708f16fd PeakCAN: Update documentation for added CAN FD functions + 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 Doc: Add precision to QCanBusFrame::setFrameId description Change-Id: I2662d98bb7c7aae0edf9a6dc03005bddb5745686 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |/| | | | | | | | | | | | | | Change-Id: Ie7e7561dcabab611a72de203ff10ccd4a049d1da
| | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-08-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a49336c78a0b610b2dff25ecc1f292bdeefbfda7 Android: disable tests requiring plugins + e163199a2ff396de0a2395a8d4be7bdf443e682c QModBusReply: Fix typo in documentation + 144916119e83e342d6b46127fb3ffabaa365b4fb Bump version + 76a08e3d59a0ef7020464d73df6dd5a01e58c230 Add changes file for Qt 5.12.4 + 4258ea1cf66f3b4e710b05c87b77622c7115284b Bump version + 1dda855cfc82db70fd937b1c33f9af57482a5d43 Bump version + 6ba24bbf130a74a5131d32951bacd257c179d215 Doc: Replace example file lists with links to code.qt.io + 43d746c2c0c87c8694e835f3b052317c8fa02482 SocketCAN: Fix compiler error "‘SIOCGSTAMP’ was not declared" + dd9b3d7ee62019d75764be7e49468976708f16fd PeakCAN: Update documentation for added CAN FD functions + 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 Doc: Add precision to QCanBusFrame::setFrameId description Change-Id: I70ecb828667faf3422479f636df9698bd9c1f192 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | | QCanBusDevice: Make Filter comparison functions non-member friendsAndre Hartmann2019-09-102-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symmetric operators, such as op== and op!=, shouldn't be members, because member functions do not allow for implicit conversions on the LHS argument, which introduces an asymmetry in how the RHS and LHS arguments are handled by the compiler. We could add the operators as non-member non-friend free functions, but since Filter is a nested class, there's a lot of code between the definiton of Filter and the point where we can lexically declare the operators for the first time (after the definition of the outer class). Code between these points does not see the operators and thus behaves different from code that follows the the definition of the outer class. This is subtle and while in the present case, there's no indication that Filter may get an implicit conversion to some other type which does have an equality operator, there's always the possibility that such a thing might be added later, in which case code using lhsfilter == rhsfilter in the body of QCanBusDevice would call a different operator== than code outside it. It's just safer to declare the operators as soon as possible, which means as non-member friends. Change-Id: Iadd097a9d64d0b1c912b750d6d89431b42def313 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | | QCanBusDevice: Undo source-incompatible changeAndre Hartmann2019-09-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in eca5edf45a8043 Change-Id: If1586d0b62b0544feee5b07289503966efa0f16d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | QCanBusDevice: Improve callback register functionsAndre Hartmann2019-09-052-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I9c2b985768be34308580940c4013448d027fc75b Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | | Fix \since for QIODevice *device() constAndre Hartmann2019-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I62f90b793fd5bcd64c727619f4064fa5f0cbed6d Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | | | Add missing \since to new membersAndre Hartmann2019-09-041-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If35c526887b32c06b25f2b59d2b43e09b0fcb248 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-131-0/+5487
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-131-0/+5487
|/| | | | | |/ / / | | | | | | | | Change-Id: I27e3cc8e4200cc12606a32ec253794def104a3f5
| * / / Binary compatibility file for Qt5.13.0 fr QtSerialBusMilla Pohjanheimo2019-08-121-0/+5487
| |/ / | | | | | | | | | | | | | | | | | | BC file added. Change-Id: I0c59afb6169f0915c0f23048ed19566765383f3d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Remove usages of deprecated APIsSona Kurazyan2019-08-062-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace QSerialPort::error(QSerialPort::SerialPortError) with QSerialPort::errorOccurred(QSerialPort::SerialPortError). Task-number: QTBUG-76491 Change-Id: Ic1d0a9ff89d346eca6cd2fd448cc02360c5e8783 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QCanBusDevice: Enter QScopedValueRollback laterAndre Hartmann2019-08-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... in waitForFramesReceived() and waitForFramesWritten(). Change-Id: Iadfe569de989f6bdc3aa6fae81a12b6a3ac2ee9c Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | QCanBusDevice: More error codes and messages on failuresAndre Hartmann2019-07-313-55/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More error messages can now be logged with the logging framework or directly accessed with the errorOccurred() signal. The new error codes QCanBusDevice::OperationError and QCanBusDevice::TimeoutError were introduced to signal situations where the device is not able to perform a specific operation respectively when an operation timed out. [ChangeLog][QCanBusDevice] Added the QCanBusDevice::OperationError and QCanBusDevice::TimeoutError codes to signal wrong operation respectively timeout errors. Task-number: QTBUG-70449 Change-Id: Ifa0831bd0947b624579ae8662df10a2a9ce38714 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-302-5/+26
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:25:06 +0000