summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtserialbusv6.2.0-beta2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I05579a1c6ac179a8c121e5606dfc85b00a9ca67d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I272c3374ef1e473b6cf2ece6aa5768c4f4f2db72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: I5d13bbf23cc9031d172082ddaba883d29090e2f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QCanBusDeviceInfo: Add method to obtain the plugin nameAndre Hartmann2021-07-2315-24/+60
| | | | | | | | | | | | | [ChangeLog][QCanBusDeviceInfo] Added the CAN bus plugin name to QCanBusDeviceInfo. Custom plugins must be adopted to the changed QCanBusDevice::createDeviceInfo() method. Change-Id: I44d658aaa6f873eecce447dd9ee4539c9fbe2043 Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 3b2ce7c739ca2bb5b47d26fc1b0ee4294f49f0a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Explicitly link against the built QtNetwork libraryAlexandru Croitor2021-07-2325-1/+26
| | | | | | | | | | | | | | This is to ensure that the pre-existing QtNetwork library from the b2qt SDK sysroot in the CI is not picked up. This is likely a consequence of CMake not adding an -rpath-link flag when linking. See QTBUG-86533 for details. Task-number: QTBUG-86533 Change-Id: Id05d49812f957c8a6c12c03f5ff633015bd63103 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4a2828a3d30fa1e4760a6778b8b58569caefb632) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QCanBusDevice: Consolidate createDeviceInfo()Andre Hartmann2021-07-239-41/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This protected function is used from the CAN plugins to create QCanBusDeviceInfo objects. We want to add another parameter (plugin) to the function in a follow-up commit, so let's first remove unneeded overloads that were created during Qt 5 times and only keep the very simple and the all-embracing one. While at it, remove the std::move calls as clang gives performance warnings here: socketcanbackend.cpp:149:23: error: moving a temporary object prevents copy elision socketcanbackend.cpp:149:23: note: remove std::move call here Change-Id: Ie83db3cd3a9d6b40b2da4a9ce736861a0ee8359f Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 98691947d1aa6fb3ab63c7b749bc6407fa01be8a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: Ia71547294708133612d2c0879be4b175c96f92fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CAN: Make functions that should be virtual suchAndre Hartmann2021-07-2212-86/+43
| | | | | | | | | | | | They were not during Qt 5 times due to our binary compatibility promise. Change-Id: Ia5ddb114db9dc552515df5ab4b22d0c962a0a341 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8199ed388753dda6239a597fb4bb7acba664f73e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I540c52f0f41a60d4d76e6828a4ad0ea73d9921ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I6633a791f9bb5f34e040548d0569cf991e1777a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QCanBusFrame: Add constexpr where applicableAndre Hartmann2021-07-211-18/+18
| | | | | | | | | | | | [ChangeLog][QCanBusFrame] Made more member functions constexpr. Change-Id: Iee30eb340ef23f32a43a1b33c641d1722385bbb3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit b0a6187e8676719403af42e0efa89d60e266c480) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QCanBusDevice: Make deviceInfo() publicAndre Hartmann2021-07-211-2/+1
| | | | | | | | | | It was meant as public member function for 6.2, but got protected by accident. Change-Id: I3ca36f1da03782738e14c90e7f1cd50c8ea74a47 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> (cherry picked from commit 1065d7365d34f820346b225931616b88dda7bab0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-211-2/+2
| | | | | Change-Id: I9c42cbd4b78a69274af5b16b09758dad35f10f9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: Ic9bf60839a9f8fa38de7addc41cd6fb48dd63442 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Peak/VectorCAN: Fix reading incoming frames on WindowsAndre Hartmann2021-07-202-16/+4
| | | | | | | | | | | | | | | | Overriding QWinEventNotifier::event seems unusual, so let's use the documented way and connect to the activated signal. As this was broken after 5.15 and 6.2 is the first Qt 6 release, no changelog is needed. Fixes: QTBUG-95040 Change-Id: I294aa398a2ccd99012db855ed74935a944b2e6d2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 117e99dffd800780e3f29f5d88c1cb171739ad50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I16180363811467b2a97b7ab89a3f196990303a5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CAN: Fix overreading QByteArray bufferAndre Hartmann2021-07-194-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code did not take the size of the payload QByteArray into account, so that for small payloads read accesses outside the QByteArray data field occurred. While this should be no big problem in reality, memory checkers like Address Sanitizer will report such issues. We now only copy the bytes the payload QByteArray really provides. We can do this, as every derived QCanBusDevice::writeFrame() method already does a QCanBusFrame::isValid() check before enqueuing the outgoing frames, so that the maximum length of the payload field is always guaranteed, for CAN 2.0 as well as CAN FD. [ChangeLog][CAN] Fixed potential read buffer overflows when sending CAN frames in diverse CAN backends which were detected by Address Sanitizer. Fixes: QTBUG-94695 Change-Id: I2e45f6c14ae0fe88ba83f52dd5db4ffe24dada58 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8eaa91e1edd7a2b5849a18487a08c440b2b7a27a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-191-2/+2
| | | | | Change-Id: I1ad6a7e3d356b647907afce9ddf63892836b8e12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-181-2/+2
| | | | | Change-Id: Ia232bf7ad2b3ac6bb283d150632f4bcdf888c088 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-161-2/+2
| | | | | Change-Id: I52bbb1ba983c48f817de1caea06360742012031f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-151-2/+2
| | | | | Change-Id: I8720f570f24d88230e437ab5a831e3baa93f15f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-141-2/+2
| | | | | Change-Id: I71ea0c451103b904894857c0b3f25ca0565198cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I99f092573d29b39afc63d0fee32da39b03c5731d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I9e14526db20bd054bc5cac5a767aefb7b515f866 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-121-2/+2
| | | | | Change-Id: I5fc9287b0a42616fc98f61918d240624de4bd4ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-091-2/+2
| | | | | Change-Id: I8be99623a3abf2637f1d870689318246d178a890 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-081-2/+2
| | | | | Change-Id: I525450c86f96b9b0d47720382ba3d6c583bc7cd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-065-5/+5
| | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Task-number: QTBUG-90819 Change-Id: Ia7a8f27d4eecf067055511577ec664ad857905cd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d4d1653efc547af7af3f37a51bc97f9945fa5163) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-061-2/+2
| | | | | Change-Id: Iad499ccfc408a15339df6584023ebbf3467e243f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-051-2/+2
| | | | | Change-Id: Ia10dba632958f4234bbe9bc3c20dff27a7d5e81a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-021-2/+2
| | | | | Change-Id: I1a8187aa020858a506162531d3d6e4750a13b3ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-011-2/+2
| | | | | Change-Id: I256a2db351d33532f49cc83e7e6dc67cb761a331 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* PassThruCan: Switch from invokeMethod to PMF overloadAndre Hartmann2021-07-011-8/+8
| | | | | | | | | | Fixes: QTBUG-94838 Change-Id: I29002db6dca6c5f2e19bd463c7f83f44cba2d009 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Jonas Larsson <jonas.larsson@systemrefine.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 62e7b5cc737db6c9fd29a04fc65a76d11db599bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-07-011-2/+2
| | | | | Change-Id: I4d043ed9831337910e654d6425ab602845fdde74 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusv6.2.0-beta1Qt Submodule Update Bot2021-06-301-2/+2
| | | | | Change-Id: I1208c5bf422fdfcbf452540fe0c73fa43549a9f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-291-2/+2
| | | | | Change-Id: I39979e0f46c181ec9c1dcae59bc487ad39831ddf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-261-2/+2
| | | | | Change-Id: I6d208d48613a9ec5c7b05b4ab06ae29dd28a1b9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-251-2/+2
| | | | | Change-Id: I1ce18d47a1605d20637facfe49fbef103b8cf0c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-241-2/+2
| | | | | Change-Id: I256fef5933bc81ad583430a969c8cd0b84ed8d65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-231-2/+2
| | | | | Change-Id: Ifa0a81ae64b3c6bba501d0acbd2e49e298c7fb57 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-221-2/+2
| | | | | Change-Id: I955d170ea940fff79157b71daac6844378578579 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusv6.2.0-alpha1Qt Submodule Update Bot2021-06-211-2/+2
| | | | | Change-Id: I433b449b00098296bf2c51a1a40aaba389a59c58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-211-2/+2
| | | | | Change-Id: Id3b7bb7ccf5e4d38963d5f132b37a0cc2a711a76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-181-2/+2
| | | | | Change-Id: Ide21ee50e41296be6ef0089fefcaa49fac8cc99c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove old configure-related filesJoerg Bornemann2021-06-172-65/+0
| | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: Ib0c67ef861216f4d64a00c80ed0a9366eab8f262 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 38cacbd944c97a45ef23f559229f2954209765c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-171-2/+2
| | | | | Change-Id: If91b0b1a2b233629c03782e98a6bcf97e4b28002 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: I4b0e36bcd2533a2851fad9c6540d94dfdebba32c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: If7bc02da496ce68c0c06aa56fe6bcf4ce2c83321 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: I9b1ab5cc5d7b00eb66f46df29b6e09aa82e38777 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-06-151-2/+2
| | | | | Change-Id: I251b8a47fb6c1a8a44999f9f269b5543abfab24c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 17:51:09 +0000