summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtserialbus6.2.0Qt Submodule Update Bot2021-10-041-2/+2
| | | | | Change-Id: I5b39b657e04fec1df823d3f27e8833310c6dada3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-021-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: I9263f4e1a353953291d0bbb465ecf99036370807 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qtserialbusv6.2.0Qt Submodule Update Bot2021-09-241-2/+2
| | | | | Change-Id: I40961bf088a466c8164a616d7885b0cb698d67ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-231-2/+2
| | | | | Change-Id: Ib1d0680570b6076452e7842fc9ae6a184e2eb934 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-221-2/+2
| | | | | Change-Id: I220dbf8e6c16aaded076099a2387b228c13ae257 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusv6.2.0-rc2Qt Submodule Update Bot2021-09-211-2/+2
| | | | | Change-Id: I2ae6b41d0ba4aaf67a47a6a70f539da8a2c9b3f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-191-2/+2
| | | | | Change-Id: Ib9926be83f1efca2144ac8857bcef17b53e33a94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusv6.2.0-rc1Qt Submodule Update Bot2021-09-131-2/+2
| | | | | Change-Id: I9b84ed9bed62e7ceaeb2ad721c2e187cc0506ef5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: I2236d7ddbb788ff79d56a547bbf641640f842a56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-111-2/+2
| | | | | Change-Id: I54c14484d063d8168e081977d6ae360cd5004d77 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-101-2/+2
| | | | | Change-Id: I780c5646bb5d51b45054fc8608d2e18ba5226bd7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtserialbusQt Submodule Update Bot2021-09-091-2/+2
| | | | | Change-Id: I40a6d4ddc52cebc48a341244a95f596641ce675f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-081-2/+2
| | | | | Change-Id: If2b023134e14c654e967efb3275a93f9aeacd57a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-071-2/+2
| | | | | Change-Id: I0d1b7e600b222f79b13acbd4e8572b9e42732071 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-061-2/+2
| | | | | Change-Id: I33e4f386bec7f1baa4af25e7b15674d02b48212d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: I737df7d33d81e5b13f8cdfea4d6f1a856f76f483 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: I770e89895db161b1565878836a2190756187e265 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-041-2/+2
| | | | | Change-Id: I7cc444775b73934f9fde767c6362b732d3c39e4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: I8531a782b4888024187081cb80a631ff9abf1103 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: If65585310e2a8110e6fd650e40c91d3ea7533a75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusv6.2.0-beta4Qt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: I461ca4949e7fa3bca5318a935b6393a98d50bd97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I7766333ea9428ca5f56180a7ddce498b98537167 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: Idefca718c326c4f5e06c7c801bede4e384a1eb28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: I21ef3827c5dbb705097f58e1b98fdf018eaab567 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-271-2/+2
| | | | | Change-Id: I0c28a57e93f3010ec7b9f784e203551ee72acb94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Support builds with ConanIikka Eklund2021-08-262-0/+71
| | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94823 Change-Id: I32ae932f711347869990551955cdb70245e2e041 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e902921bb2b967b1434006e4b255ad8cbee2deec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-241-2/+2
| | | | | Change-Id: I68733d7433e0f5467daf345188e288284d73d392 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-211-2/+2
| | | | | Change-Id: Ib77962895bdb589da3207e75a26d3d03eae5ccd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: I3bd80ecab06dae05d7fa1149ae84cf2d5c6cf6f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-191-2/+2
| | | | | Change-Id: Id9358cc04030229d1eacc8a5d08fc1f128b16c4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: Ifc4552c1b71daaab39ec519e097db1c70e707afa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I0e0e67172d3776e02b8fc4f9ea8daf01a1fbdcea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add class qualifier to the \fn signatureVenugopal Shivashankar2021-08-171-8/+6
| | | | | | | | | | | | Fixes these qdoc warnings: qt5/qtserialbus/src/serialbus/qcanbusdevice.cpp:152: (qdoc) warning: clang couldn't find function when parsing \fn bool operator==(const QCanBusDevice::Filter &a, const QCanBusDevice::Filter &b) qt5/qtserialbus/src/serialbus/qcanbusdevice.cpp:160: (qdoc) warning: clang couldn't find function when parsing \fn bool operator!=(const QCanBusDevice::Filter &a, const QCanBusDevice::Filter &b) Task-number: QTBUG-95860 Change-Id: I0e339b760dd9528c88c9f4a8f3830ea12f4ce9d0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit de29ef1614b41e6198c3d563ab0ea1393096d4f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-174-4/+4
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I821f412f9dbe11ae99ffd888a7ab2ba415ed9379 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 65eca83d65b1970566bbd877188cb766ef80bf74) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I00a9f844fcbcbcf7e05801655074918d4dbcaed0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-161-2/+2
| | | | | Change-Id: I33b8dd580732f2c4a94e13c4a5ca5e389abfb50b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix examples to search for the Network packageAlexandru Croitor2021-08-124-0/+4
| | | | | | | | | | | | | | | A previous change added an explicit link dependency to the examples without searching for the package first. Amends 4a2828a3d30fa1e4760a6778b8b58569caefb632 Task-number: QTBUG-86533 Fixes: QTBUG-95387 Change-Id: I6d5fb5d3d62acc877e096951e0a6d70b5d63baa8 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fde4104fde034e7bb611cd8d83fc11af880ef775) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusv6.2.0-beta3Daniel Smith2021-08-121-2/+2
| | | | | Change-Id: If60480c16bf4c33053a0373cf9d5677a7550b21b Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-108-8/+8
| | | | | | | | Task-number: QTBUG-95170 Change-Id: I1d462fa520ab01ae41c54aa5c44e2ade716b050a Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 136bd3928c6cfdf804c2d16ed8c39e2c2adae6ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-101-2/+2
| | | | | Change-Id: I5ccd85508d7c35c95c98f1c0946491103d140029 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CAN: Implement QCanBusDevice::deviceInfo() in the pluginsAndre Hartmann2021-08-0515-30/+141
| | | | | | | | | | | | | | | * PasstruCAN: Untested * PeakCAN: Tested on Windows with PCAN-USB Pro FD. * SocketCAN: Tested on Linux with virtual and real hardware. * SystecCAN: Tested on Windows with USBcanmodul2. * TinyCAN: Untested * VectorCAN: Tested with the virtual Vector interface. * VirtualCAN: Tested on Windows and Linux. Change-Id: I3836a81a9cb1570a22b6264b34fca88ccc0ab57e Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit a9a7ffb5a97f254a57591e69c3e24212d1743cf4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtserialbusQt Submodule Update Bot2021-08-041-2/+2
| | | | | Change-Id: I1bfb25f3020acf4cd82164722a0de897bc8c8c7a 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-291-2/+2
| | | | | Change-Id: Id1e4dec4a2f382033ed9df6c7572e57edc67a803 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-281-2/+2
| | | | | Change-Id: I0cccd17af79147f54d2aa05f1dbcf11f821d524e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename the generic CAN pluginAndre Hartmann2021-07-2711-41/+41
| | | | | | | | | | | | | As this plugin is used for auto tests, testcan is a better name. This also fixes the inconsist naming between "dummy" and "generic". Change-Id: I2d9a70c240899b4ec6f80c78eeeaf004f05b1976 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 45614a4b3070d66afaed65849b706d8976e7e928) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Update porting guide with CAN changesAndre Hartmann2021-07-271-4/+27
| | | | | | | Change-Id: Iea0c4fb66cbe6162e3caa8faada2c6e012a8c23a Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 21827b4e43f8eefa6479104f4384f1e34c0cb923) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>