summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.12.125.12Jani Heikkinen2021-10-041-1/+1
| | | | Change-Id: I55c450d5a4e55c0b8964a2a478c93766d86b4584
* Bump versionv5.12.11Jani Heikkinen2020-11-061-1/+1
| | | | Change-Id: Idbc5ad9c9941f51845b8d027f5e8857d43a92d77
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I5d98947138d25108e4f75becb47afeda3a1f5639 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit dbddf24b08141ffd2f1ed98fbcf64b1220161e05) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: Ie1e01229d50eb55daea66ddc8b35f415682aa1ec
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: Ifdefc27b2af41d3fb2f3d542e3ab7c7d0acd26bf
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | | | + 6073642cc57519fabf20d841b50af148f07cc4ef Bump version Change-Id: I4f43275c2a8578f9f40a756f3470944dd057ed3b Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: Ic386d79318c36b319af51f74c8466e3311ce0875
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I3663446e551715aea9fb8e36e53fa427bdd6654c
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-171-0/+20
|/ | | | | | | + 1ab8dfc8761d04ae027405ba93ca1e1f6fc142cb Bump version Change-Id: I89ca68b944303a52992ab2bd56d748b18c4644c3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+25
|\ | | | | | | Change-Id: I81cf719f19182d1c32cffd84d748ac5656a48220
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-181-0/+25
| | | | | | | | | | | | | | | | + 0606a2215e0c11debaf5547babccbdc40321c182 Bump version + 95bda423b61733c5f8780c4b61e3bc62f9fa17c2 VirtualCAN: Fix disconnecting from bus Change-Id: Ia7db945d08d84bc0999e394660425cc3724ae709 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-074-20/+45
|\ | | | | | | Change-Id: I78703f2da399d804af6fe20ad3149899fa3e6fae
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-061-0/+25
| | | | | | | | | | | | | | | | | | + e993a7f1f24303b4b1274b8b0d5e747bc00b9dce CAN: Avoid symbol clashes on static builds + b0970e495f77e43bda85dbe267cf5c7cb7bfdf75 Bump version Change-Id: Iae399fb2c1c1768652c4c1ddb14b74b7cd12cb5f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Avoid conflicting class names if the plugins are linked staticallyAndy Shaw2019-11-053-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> (cherry picked from commit f129107e472c179e47b37d8fdaff120d1eccc7f8) Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | VirtualCAN: Fix disconnecting from busAndre Hartmann2019-11-221-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> (cherry picked from commit f47b712057676de6115d7320cbbc2eb9b20c9817)
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* 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> (cherry picked from commit 80144b89ca1adede0db9d6e485037f5e431216c3) Reviewed-by: André Hartmann <aha_1980@gmx.de>
* 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>
* Doc: Add precision to QCanBusFrame::setFrameId descriptionPaul Wicking2019-07-221-3/+9
| | | | | | | | | Done-with: Jochen Bauer Fixes: QTBUG-75502 Change-Id: I3a91c9b0c52985f5fe3ea357c8813c27ddbfd28d Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* PeakCAN: Update documentation for added CAN FD functionsAndre Hartmann2019-07-181-2/+17
| | | | | | | | | | When adding the CAN FD functions to the PeakCAN plugin in ac8509d992f4, the documentation was not updated properly. This patch catches up on that. Change-Id: Ib3d05d4aa8405226ede9616bd56ead1a8f98ea88 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* SocketCAN: Fix compiler error "‘SIOCGSTAMP’ was not declared"Andre Hartmann2019-07-091-0/+1
| | | | | | | Fixes: QTBUG-76957 Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: I5effe4fe0811d2526cbb126abcf549ad2757440e
* 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
|/| | | | | | | Change-Id: Ia3a8d9127ad41df57febb72b8f3a19c99f4296a9
| * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-281-0/+29
| | | | | | | | | | Change-Id: I1951398962497af5dcc6f51e86a8aa18e376c214 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | Change-Id: If16b76e4070bbafdac28ec730d9d5b4daa04b982
* | Android: disable tests requiring pluginsAlex Blasche2019-05-081-1/+2
|/ | | | | | | | | | | androiddeployqt cannot work out that the plugins under qtserialbus/tests/auto/plugins are required to pass this test. Fixes: QTBUG-73621 Change-Id: Ib246ff186ec4c8688e1525fc9500d69fda4775a4 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* CAN Example: Fix entering invalid chars in CAN ID inputAndre Hartmann2019-04-291-1/+1
| | | | | | | | | | | | | | The old code returned Intermediate for invalid inputs (e.g. chars outside the A-F range or special characters), because input.toUInt() returned 0 for these cases. Fix that by checking ok from input.toUInt(&ok) first. To allow clearing an edit field containing valid input with backspace again, an additional isEmpty() check has to be added. Change-Id: I4ae28e35ca21611fc5f323b26cdeca75257f1352 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: Ie0c4fa6f6e291c52c2ff08a5d45fc8c289134168
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | + 4f5301171b19c74f6e7284c978a2f13f4ffa7a19 Correct typos in qmodbuspdu.cpp's doc + 97b803f799fc1a084aa356547fadc4ca918b1ab9 Bump version + 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 Fix typos + 76cbf4b7d10db3aa8944c8480a6c504548f0e070 VirtualCAN: Slightly adopt debug output + d5b3a2b6e6462f4ad46fce8f52539333b131dcad QModbusReply: Add some more documentation cross links Change-Id: I717848fdac7a439ae53729d4888fa04e6313123a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Systec: Fix error message "Cannot configure TxEcho for open device"Andre Hartmann2019-04-111-3/+3
|/ | | | | | | | | | | | | | | | | | | When using the QCanBusDevice::ReceiveOwnKey, it has to be applied before the device is opened. While this already correctly happened in SystecCanBackendPrivate::open(), the parameter was applied again in SystecCanBackendPrivate::setConfigurationParameter() which led to the error message. Solution is to skip ReceiveOwnKey when applying all configuration parameters in SystecCanBackend::open(), like already done there for BitRateKey. [ChangeLog][SystecCAN] Fixed the error message "Cannot configure TxEcho for open device" when QCanBusDevice::ReceiveOwnKey was used. Change-Id: I37c1732798a3ce205a65ca803a99b5b7b9306d2a Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* QModbusReply: Add some more documentation cross linksAndre Hartmann2019-03-281-0/+6
| | | | | Change-Id: I9f7d2bd5724266463af473d714b452de5390349e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* VirtualCAN: Slightly adopt debug outputAndre Hartmann2019-03-251-4/+4
| | | | | | | | | | | | | | | | | | | Remove the colons from a few places to make their output similar to the debug output in other lines. Example (omitting qt.canbus.plugins.virtualcan prefix): Server [0x7f19684903c0] constructed. Server [0x7f19684903c0] could not be started, port 35468 is already in use. Client [0x5586262ecaa0] socket created. Client [0x5586262ecaa0] socket connected. Client [0x5586262ecaa0] received: '0##f9ffad71e96cb5ee'. Client [0x5586262ecaa0] socket disconnected. Client [0x5586262ecaa0] socket destructed. Server [0x7f19684903c0] destructed. Change-Id: I6d91282a262c58e2c983ee6db5c030698197c9f6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix typosKarsten Heimrich2019-03-212-2/+2
| | | | | | Change-Id: Ic7f032217e641bf573f66f1231987828ea078709 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I4ad88b67f6d0f8dad35654ab8188fdddb19f55a1
* Correct typos in qmodbuspdu.cpp's docThibaut Cuvelier2019-03-201-7/+7
| | | | | Change-Id: I8bbb3baaa568c1331d8945df158d062d68d2eed4 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: I0bd39a0ea587d0ef049dca6d67cdc8c254ad60bd
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
|/ | | | | | | | + 59f4eed65ab9730162ddf5b1d5c1ac260024a361 Bump version Change-Id: I3c9590b2baabd431ac889f5748cb518bfe9d62f5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+5123
|\ | | | | | | Change-Id: I5c76688d19540eb521fcc10824dbe460bcc04add
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | + df3487b7609fdbe55fff9d116f95d68567f11393 remove pointless PLUGIN_EXTENDS stanzas + 200822ca61732693cc97802b953cd846654eb319 Bump version + afb7f76efafcb04e430168416d9d74113bde13bc Make pduFromStream work on big endian + fb7a0ef5b31cba52a745006bf9dca61101229de8 Improve QModbusDevice connect/open documentation + 857ed94b55b59859f41c55076c51e92f163cb9f7 Add changes file for Qt 5.11.3 + bbbda19310890c8ae27d0e72547d612d1d1ac0ad Add binary compatibility file for QtSerialBus for Qt 5.12 + 2b51f76ab712690cc263516d628a4f8cbb723ba8 Bump version Change-Id: I21d4ddaea6058ddf0e3d6187e186d2ec037f87f7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-083-3/+30
| |\ | | | | | | | | | Change-Id: Iad701a48d7f8039dc3b8f3ba9dcda661c38bbfd1
| * | Add binary compatibility file for QtSerialBus for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5103
| | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I3f63fc11a7f5b8ab24f9334aaf2f71ac989fe303 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ |/| | | | | Change-Id: I85cd0abf4b38965ccafcf86e4303f8b4782d6bcf
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I11c9d4a25e159e8d1b9b2a8639610966f0cf122d
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-112-2/+29
|\ \ | |/ |/| | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia0da4c27d820778cb156a73cbad4fe79f0694267
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+26
| |\ | | | | | | | | | Change-Id: Ic03591a029dd226384be896a0b305f8f21a94ffe
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 06:33:17 +0000