summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtserialbusv6.2.8-lts-lgpl6.2Qt Submodule Update Bot2024-03-261-2/+2
| | | | | Change-Id: Ic536f09755602ff6eaf0166527acf7a66c4b68de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into ↵Tarja Sundqvist2024-02-2010-17/+16
|\ | | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Conflicts solved in a file: dependencies.yaml Change-Id: I234bfebfbf805f9a5a5acebeac1a8413902c809d
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-291-2/+2
| | | | | | | | | | Change-Id: I0dfab293ec382382c247b393781b56e3cf8c9bb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-271-2/+2
| | | | | | | | | | Change-Id: Iaf5befb6af70795bdbd078a7441364bc4f37b470 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-221-2/+2
| | | | | | | | | | Change-Id: I4271a6862689f0926b8ea00051c1cb0829fc80aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-161-2/+2
| | | | | | | | | | Change-Id: I8190dab13a8c80094ca870d040d560e6d4670003 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-131-2/+2
| | | | | | | | | | Change-Id: I831d526ed57d906953c7048499231f6453895a8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-03-101-2/+2
| | | | | | | | | | Change-Id: I887145512608f124a330e0f1c7af1962bedf812f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-271-2/+2
| | | | | | | | | | Change-Id: I90a627433ea8d112daf3d4bb8110ec32423903ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-211-2/+2
| | | | | | | | | | Change-Id: I1b2d9b494fa40e061c95e87fe923c4079350289f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-161-2/+2
| | | | | | | | | | Change-Id: Ib872fde516ff69e00bdc10604cb6e75d65a6ce3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * QModbusTcpServer: do not store client sockets in a separate listIvan Solovev2023-02-112-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'connections' list was used only for tracking who is connected. We can just call QObject::findChildren<QTcpSocket *> on the QTcpServer instance for that. This fixes the issue with removing data from the container while iterating over it. The old code was also removing the data from the container while iterating over it, because calling socket->disconnectFromHost() from a ranged-for loop results in sending a QTcpSocket::disconnected() signal and immediately calling the connected lambda. This patch fixes the issue. Change-Id: I24d8c197545162af232d438d0941faba6ffc94d0 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit a18c97f1a897e4653a47a45976d78bea5a2243be)
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-101-2/+2
| | | | | | | | | | Change-Id: I52d0f8cfb95df228b10b5efb8bf56b213dbff678 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * QModbusTcpServer: fix memory leakIvan Solovev2023-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed while improving Modbus Custom Command example. Before the patch the QTcpSocket::destroyed signal was connected to a lambda in context of the parent QTcpServer (the 'q' variable). When the application was closed without disconnecting the server in advance, the QTcpServer::close() was called in the server's destructor. The client sockets were disconnected, but by the time their destructors were called, the parent QTcpSocket was already in its desctuctor, so the connection was destroyed (because deleteChildren() is called after invalidating connections in QObject's d-tor). This patch simply changes the context of the lambda's connection to the socket object itself, so that the lamdba is correctly invoked from the socket's destructor. Change-Id: I04e196645db35c390a2bb255f1fadaac336fec25 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit bfb62b60ad6873ad1912df0f08ce9cf7fd80447b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-071-2/+2
| | | | | | | | | | Change-Id: Ic2f18450957911d2ac69f883fa9c96d95107269b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * PeakCAN: Add doc note about supported MacCAN librariesAndre Hartmann2023-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for MacCAN was added in Qt 5.14. The existing MacCAN library PCBUSB 0.8 used 64 bit instead 32 bit parameters. Therefore a wrapper was added to the peakcan plugin. With PCBUSB 0.9, the parameters were changed from 64 bit to 32 bit to be compatible with the PCANBasic library. This change makes PCBUSB 0.9 and higher incompatible to all Qt versions from 5.14 up to 6.4. For Qt 6.5, a fix is merged: b0eede2dc58df1805a0745ff72e9dee51a08e9e5 Change-Id: Ic06c1ff3bcfeb025c5a14ecfe803a0b51731fc20 Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 8fb1d0cbabfb9ec40e15b52907c5f0a8055f5d6f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-02-031-2/+2
| | | | | | | | | | Change-Id: I623c510a07b1ca8fd2d9d8571641919a7be08594 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-01-311-2/+2
| | | | | | | | | | Change-Id: I944497e387add6748fdf5cb8f4fbe2b5f37b671a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-01-171-2/+2
| | | | | | | | | | Change-Id: Ie76babf7986976bbb0d3a78430cd68dccd55cb8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-01-091-2/+2
| | | | | | | | | | Change-Id: I718bd95b4ace4017320fabbd89c18cdbb5ca10b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-01-031-2/+2
| | | | | | | | | | Change-Id: I5803d472c3b78fdd905050a1eed7f827e5b58125 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-281-2/+2
| | | | | | | | | | Change-Id: I177cf2f67ecb3c2ba9e163d3c81a47bb19290837 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-231-2/+2
| | | | | | | | | | Change-Id: I9c08488200aa53ba816f7b1ff77da81b0f9ab9e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Doc: Fix typosAndreas Eliasson2022-12-211-2/+2
| | | | | | | | | | | | | | | | Fixes: QTBUG-107141 Change-Id: Ia9a76d95d8b494282f1d0ef75576e96164330fc4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 797af079367b79610c0b5f09723c6264bb26c622) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * CMake instructionsJaishree Vyas2022-12-202-1/+2
| | | | | | | | | | | | | | | | | | | | SerialBus CMake instructions , typo fix Task-number: QTBUG-107137 Change-Id: Ib5913a831fbd5ead11f4a1599d0b9e1e8815c087 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit e481cb60e9b68cd789ba65ed89deb5edf4d841d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-201-2/+2
| | | | | | | | | | Change-Id: I9d4ca14101972e0bc145d58ca30b6cf32a4e382d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Fix typosCreapermann2022-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | Remove wrong 'the's from descriptions Task-number: QTBUG-107137 Change-Id: Ie901f7cc8fa4afd5c3d65a315ba178840c051c9f Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 1f7df57a3bd3f89eff62c3e325a7ee62209320db) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-151-2/+2
| | | | | | | | | | Change-Id: Id48ae8c2324a56327098b4c3e76125dbe0f752a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-111-2/+2
| | | | | | | | | | Change-Id: Ia2c23a32564d046c880214f942e11040ada5c950 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Bump version to 6.2.8Tarja Sundqvist2022-12-112-2/+2
| | | | | | | | | | Change-Id: I3866e61b31d54061be1ec0743c27f67989120d93 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-12-051-2/+2
| | | | | | | | | | Change-Id: Ie52823966edf371cfd10a257239cf4ddbc053ad6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-291-2/+2
| | | | | | | | | | Change-Id: Ic0451fae5107549d07c648404b6156e9c5db945d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtserialbusv6.2.7-lts-lgplQt Submodule Update Bot2023-10-311-2/+2
| | | | | | | | | | Change-Id: Ib45f35b135a9999891e25a3f0080b573cdf95d83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtserialbusQt Submodule Update Bot2023-10-111-2/+2
| | | | | | | | | | Change-Id: I28f3dac8853460ad9f6f304d4ee517f9522a1c01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into ↵Tarja Sundqvist2023-10-035-9/+10
|\ \ | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Iadf16ca1ce1209d0cc86a0e45f45e377f4d76f0e
| * | Update dependencies on 'tqtc/lts-6.2.7' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-281-2/+2
| |/ | | | | | | | | Change-Id: I0c56128807207a2eae8cdba018c5939369e9d925 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Coin: Add alias to non tqtc moduleToni Saario2022-11-231-0/+1
| | | | | | | | | | | | | | | | This changes the module name in Coin to match what is run in qt5 integration and allows reuse of artifacts. Change-Id: I4defd8a6a7841b3a18cbc3b1790ea2e7a4710c9b Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-221-2/+2
| | | | | | | | | | Change-Id: If061753e008acbdf419a232d47c1f556b5e2aef1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-181-2/+2
| | | | | | | | | | Change-Id: I060aca38e12cf3997988dd741972da386b28d8f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-141-2/+2
| | | | | | | | | | Change-Id: I57dde994fbf0ba9b8f299c6bd0613111f323289c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-111-2/+2
| | | | | | | | | | Change-Id: Ife7f48f370eeb69d7c727670dfe557f150017a10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-081-2/+2
| | | | | | | | | | Change-Id: I2b0b36cb92c01ab10fd660591e174ca3c2ac6803 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Doc: Fix typosAndreas Eliasson2022-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | Remove the extra 'the' and put a comma after the dependent clause. Fixes: QTBUG-107132 Change-Id: I1407ec7411a12bd47ed4a53f961158856abb1151 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 905beb90ca3b646e70f94318feb9224350a27336) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-031-2/+2
| | | | | | | | | | Change-Id: I522a41af9519cb6acc56061bdf48918a74b17344 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-11-011-2/+2
| | | | | | | | | | Change-Id: I04b4520de0aeb35fe4cf12208aa13424eefb7fb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-10-271-2/+2
| | | | | | | | | | Change-Id: I434757c19d288613ebebf2f0340f96a1b511e083 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-10-211-2/+2
| | | | | | | | | | Change-Id: Idaf5e7bd3027d565bfd28dea42e30ebeab454cd8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-10-131-2/+2
| | | | | | | | | | Change-Id: I2688bc9dca69a5f6de63138fbb79a447cb5fd36c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Brush up the CAN exampleFriedemann Kleint2022-10-121-5/+5
| | | | | | | | | | | | | | | | | | | | - Fix the documentation URL - Fix clazy warnings about multi-arg Change-Id: I86589b8b57c467624ba78e81b4d099834460149d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> (cherry picked from commit 11a33d1140acf42fdca01f42c0c4ed01e2c5ee07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtserialbusQt Submodule Update Bot2022-10-071-2/+2
| | | | | | | | | | Change-Id: Ieb975616407f23d1bac1cd47f79a7b14dda6131d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>