summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QCanDbcFileParser: fix the size of Unique IdIvan Solovev2023-06-097-42/+53
| | | | | | | | | | | | | The unique id can contain 11 or 29 bits, so apply a mask when extracting it. Update the unit-tests to use a bus value with the 31-st bit set, to make sure that we handle such values correctly. Fixes: QTBUG-114043 Change-Id: I1164bc13980af998007e35a3dcb4c22db2bda755 Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 42cbbe9b681e6e8c2a6e1b9a88679e5158ec3977) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-06-091-2/+2
| | | | | Change-Id: Ie0dcd7f4c380ae2605f30bb2f92117e3e6d753f5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-45/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: I683b325910e65e7895740b6bacff7f8c8e3624ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c8fd9abf628ea8f35c465e183ebe250d4411381f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-06-071-2/+2
| | | | | Change-Id: I96db9b25ecbd3d66bb5e1041a8a46965ab621ec1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-06-061-2/+2
| | | | | Change-Id: I40f74fcf7c7ebaaccbc7ead6ae1d5971c4dc68a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-311-2/+2
| | | | | Change-Id: Iaebd7c0c9ebdbd04c895218d90b0dadc28a83338 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-291-2/+2
| | | | | Change-Id: I51109ed25975dd79fb4664e42f98ed4341d09414 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-251-2/+2
| | | | | Change-Id: Id175fc58ca6313382d17fc34cbffa78ef2b399ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-241-2/+2
| | | | | Change-Id: I7a7c3eee1a782e313794e1d8302ef6bd5efcb267 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-231-2/+2
| | | | | Change-Id: Ib70ab42fa233c6d77026d5d59f957d7e584a134f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-221-2/+2
| | | | | Change-Id: Ib0f47529e8f02a10a5b00b94227d72ce5d895b96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-191-2/+2
| | | | | Change-Id: Ice5325398f5726224638dc7d23e7b43918c3c208 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-161-2/+2
| | | | | Change-Id: I8f936a519625b846b49c16dda5c88663311b4849 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-121-2/+2
| | | | | Change-Id: I42210b414ec5c40fef44f0b8ce0775787651e00d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-081-2/+2
| | | | | Change-Id: Ide8b8867d8a76c6167bac558728477385f5e1a6e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.2Jani Heikkinen2023-05-031-1/+1
| | | | | Change-Id: If801882dfc454303b900c52999b9576a8eb31bb5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-031-2/+2
| | | | | Change-Id: I76223f0c4dc46f167d595f7757be34fd2df7f7e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-031-0/+1
| | | | | | | | | | The function sets the required CMake variables and policies. Task-number: QTBUG-112685 Change-Id: If25ecb7c73ff665d1bad176eb9b9b371c68f1612 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 07837027831694eaf5ed43348bdce0a9b2044cc1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-021-2/+2
| | | | | Change-Id: I2ce9ec641f833e28fd449d64496517497853406d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-05-011-2/+2
| | | | | Change-Id: Iba94a0f677a9d07749f4370f9f68cdc129227d98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-281-2/+2
| | | | | Change-Id: Ie11ef07a12a2b54fd8045d8ae13c437d0201a34d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-261-2/+2
| | | | | Change-Id: I1bcc1526050194f77d7420e07b0388ff12e96238 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: If28d7c3b1c22844977155252105ed3c8798cd8bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: Ic73d8e0e8baa51002a08ce3cda1a460dbca92c77 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-171-2/+2
| | | | | Change-Id: I839a8e211f80a7caa7bc3e6c3581b15604365ed7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-131-2/+2
| | | | | Change-Id: I0020f1886af7e8ddd6aca4223ec81ea5daf66268 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I30817559fe116ea69d6b89ebc03b70cc19f16076 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-114-4/+4
| | | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Task-number: QTBUG-112731 Change-Id: Ib1b2ea3b93e0a24d365a822965fe512851568a6a Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0c45f0423d573687917f2093e7c1d87a4bf17aa7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-04-031-2/+2
| | | | | Change-Id: Ic850f10923b90935ba2ff51946e8ca991812e928 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-031-1/+1
| | | | | Change-Id: I3e0e521b3ac54d87aee77752be56695af56859e8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-241-2/+2
| | | | | Change-Id: I760040b576bbad870cb574f5a83f1dc9be087e46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-221-2/+2
| | | | | Change-Id: Ic97370cde45c5bc230f77bff6a5632937a8cd86c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-161-2/+2
| | | | | Change-Id: Icddd6e0ac3dc9794a053843a58ed66e7f8c77969 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: I762d74201ac261e9883648acb0f4bcc7d8b5aa7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-081-2/+2
| | | | | Change-Id: I8d3380a0d3641fdb6752bfb6723ce72f3d83cd0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-031-2/+2
| | | | | Change-Id: I7678baa85d3766eb9dea894b7e62c991ec1f3bf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: I554dd5870f0c11d9d9237e0a03b8d1cf84b65729 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-03-011-2/+2
| | | | | Change-Id: Ia525130f63c4a5f42671d46fe374a085776f83ba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusQt Submodule Update Bot2023-02-231-2/+2
| | | | | Change-Id: I8d8015ee6012398b73bc191bd76d8c48ffbc8e6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename Error enums for QCanFrameProcessor & QCanDbcFileParserAlex Blasche2023-02-168-67/+67
| | | | | | | | | | | | | This change is only applied to new API introduced to Qt 6.5. The new names reflect the fact that scoped enums already state the word "Error" in their "scope" due to their explicit C++ naming. Change-Id: Ie7e4e0f5450f6ee19da537dc936c6024853979f6 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 3e55105068f02613bf687ed61e4bd12eab603c81) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtserialbusv6.5.0-beta3Qt Submodule Update Bot2023-02-151-2/+2
| | | | | Change-Id: Ic060aff938b310a0f68a0a5b2a7ebc0d4407cb34 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Modbus Custom Command: update example descriptionIvan Solovev2023-02-149-10/+107
| | | | | | | | | | | | | | | | | Extend the example description so that it actually highlights the main features shown in the example. Also update the example to match the guidelines: * Do not use Example in the name * Update screenshot * add Connectivity category Task-number: QTBUG-110890 Change-Id: Ia406b974967eaa2f5af9b935c4aac6d09253a9ee Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit b3d43080e17b7bdd8b7e2fe7a2d1fcf1ac4b54ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Custom Command Example: improve UIIvan Solovev2023-02-142-2/+5
| | | | | | | | | | | | | | | * Disable address&port line edit when the connection is established. * Add a tooltip for the expected contents of the address & port edit. * Update default TCP port to 50200 so that it does not require ROOT privileges on Linux. * Update MainWindow title Task-number: QTBUG-110890 Change-Id: I92a08a693b20510a260b4a09bfcdd68a4f6042a2 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit db59ba7847dd3784f9712c903852f3df0c5beeab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modbus Server: update example descriptionIvan Solovev2023-02-146-10/+79
| | | | | | | | | | | | | | | | Extend the example description so that it actually highlights the main features shown in the example. Also update the example to match the guidelines: * Do not use Example in the name * Update screenshot * add Connectivity category Task-number: QTBUG-110890 Change-Id: I4eb7603630a9b69fff4cf921b5adff6ea4c125cf Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit e448b2b4d402c7ef4c8b06d16a8307e5219b115a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modbus server: improve UIIvan Solovev2023-02-141-2/+19
| | | | | | | | | | | | | | | | * Disable connection type combobox, port line edit and server address spinbox when the connection is established. * Add a tooltip for the expected contents of port line edit. * Update default TCP port to 50200 so that it does not require ROOT privileges on Linux. * Use QSerialPortInfo::availablePorts() to fill a default port name for serial connection. Task-number: QTBUG-110890 Change-Id: I547d098bb38be11b4188ad129ba2a2d75aeac376 Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 81c4145f51951dab3a1472a6209f626a8ca4aee2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modbus server: fix data conversion error handlingIvan Solovev2023-02-141-4/+9
| | | | | | | | | | | | | | | | | | In line ok = modbusDevice->setData(..., value.toUShort(&ok, 16)); the value of 'ok' variable after the toUShort() conversion is immediately overwritten by the return value of setData() method. As a result, the code could never detect that toUShort() conversion failed. This commit splits the line into several independent statements, adding an if (ok) check in between. Task-number: QTBUG-110890 Change-Id: I98a9275262f5a05fee77905ce7c7d861f2dce6fe Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 65349283e32a5a0f0bf99469d9e596212a88e623) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modbus Client: update example descriptionIvan Solovev2023-02-146-10/+94
| | | | | | | | | | | | | | | | Extend the example description so that it actually highlights the main features shown in the example. Also update the example to match the guidelines: * Do not use Example in the name * Update screenshot * add Connectivity category Task-number: QTBUG-110890 Change-Id: I2296371e93b7427db960081ac10efac8deae15af Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 20d4cba63221cb144537518e492187ff82a590fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modbus client: improve UIIvan Solovev2023-02-141-2/+19
| | | | | | | | | | | | | | | | * Disable connection type combobox, port line edit and server address spinbox when the connection is established. * Add a tooltip for the expected contents of port line edit. * Update default TCP port to 50200 so that it does not require ROOT privileges on Linux. * Use QSerialPortInfo::availablePorts() to fill a default port name for serial connection. Task-number: QTBUG-110890 Change-Id: I534955726da468da9213cff8b43ae0603afe0036 Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 3287a82b4afe618144e257ab6dbe06fc34628aab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtCanBus: move QDebug stream operators into correct namespaceMarc Mutz2023-02-132-19/+21
| | | | | | | | | | ... so ADL can find them. Change-Id: I7cd6d18d73b5a7c416c1dd93fbf1405fa13b1081 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 28e5e91d0edd3b233b9a27e0b00ce95be5c3fd9c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qbswap(UniqueId)Marc Mutz2023-02-132-9/+6
| | | | | | | | | | | | | The function should be inline and noexcept, to avoid function-call overhead when using it. It also should be defined in the same namespace as its argument, to make ADL work. Change-Id: I01964121e043bc20abea53c00e81db26eed6308e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit d75f7e69e4decb6f02ad64748f3a814dbd5acd00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 13:22:43 +0000