summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QCanDbcFileParser: fix the parsing of scientific notation of FP valuesIvan Solovev2024-01-053-3/+17
| | | | | | | | | | | | | | | | | | | The parser assumed that the values in the scientific notation should always have a '.' and at least one digit after it before the exponent part. However, representations like 1E-009, 2e03, or even 1.e4 are also valid. Adjust the regexp and extend the unit-tests to cover these cases. Amends 186f34bec49bcdf69817dec016317dd1edcbfa22. Fixes: QTBUG-114397 Pick-to: 6.6 6.5 Change-Id: Ie44212a7b20b2786fb5d15dedb9c15eba5f1161c Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit bf29c9c8193ac5e3b4eeafc961b8cbd0d427b3e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtserialbusQt Submodule Update Bot2023-12-221-2/+2
| | | | | Change-Id: Ifcda9415881a63e68a69febd79c89e3d72b71f52 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtserialbusQt Submodule Update Bot2023-12-151-2/+2
| | | | | Change-Id: Iba360f9b5fa05231738f91a2fe26e8b50a218f9d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusv6.7.0-beta1Qt Submodule Update Bot2023-12-101-2/+2
| | | | | Change-Id: I84d44c0152924e6da387a0c731a2573dc2ae5f07 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-091-2/+2
| | | | | Change-Id: I777f10a6ee0cd0f244119c485dc9d42f1bb30480 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-081-2/+2
| | | | | Change-Id: I410b60d3b84e72fe50441219212a70a5371d037c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-081-2/+2
| | | | | Change-Id: Ie5d725bcae9f9fd6c8b6b9067376b7b6293665a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-071-2/+2
| | | | | Change-Id: I0ad3b2ee13839df42b9bdf813813ca26e4102732 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-051-2/+2
| | | | | Change-Id: I1a09b9ad737529966e09b992b521c26baacdc316 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-041-2/+2
| | | | | Change-Id: I9352feff7133d1c49d23baddfbd46fb6860c9e10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-12-011-2/+2
| | | | | Change-Id: I3fb38fa3b068e23830d8667c91d5fb21685f3b84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-301-2/+2
| | | | | Change-Id: Ia85603a5f15c50ac51cf15efafdb096c2cdd2eef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-291-2/+2
| | | | | Change-Id: I75424fd502c65d7a7f1575ea8ccc75820683d1db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-271-2/+2
| | | | | Change-Id: I6096efb7d91d16511376c3da7afd2441515aa8f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-241-2/+2
| | | | | Change-Id: I3120172ff01ee78d96b7b61682c6eecda6e802ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-241-2/+2
| | | | | Change-Id: I77c01e347af14f9b47151214be489a8a7848b875 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-231-2/+2
| | | | | Change-Id: If4a9fabd80ae3cff451c269f9902b06564b5e780 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-211-2/+2
| | | | | Change-Id: I0374413382229280d4114c91a3bc5dc0c9df0ed4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-201-2/+2
| | | | | Change-Id: I90c094590a445c7ec4d8af372752ee62682f00bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-161-2/+2
| | | | | Change-Id: Id81ae13931be31f98d17b95a8d27a530fce9d3e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QCanDbcFileParser: add parseData(QStringView)Ivan Solovev2023-11-154-22/+161
| | | | | | | | | | | | | | | | | [ChangeLog][CAN Bus][QCanDbcFileParser] Added method parseData(QStringView), which takes the contents of a DBC file as an input parameter. Use this method if the DBC file has an encoding different from UTF-8. In such cases the file contents should be first properly converted to QStringView, and then passed to this method. Update most of the parser unit-tests to cover two cases: * parsing a DBC file using QCanDbcFileParser::parse(). * parsing the contents of the file using new QCanDbcFileParser::parseData(). Fixes: QTBUG-115281 Change-Id: Ie9743c29e64ebb36ce57372cf23c6e1288e98b9e Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-151-2/+2
| | | | | Change-Id: I088d440db4bcd6240a88d90e352be3114d4696fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-131-2/+2
| | | | | Change-Id: Ib0690683ac2db96393b896234e106944bbab6453 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-101-2/+2
| | | | | Change-Id: I650f56d3a2fc68d82f4fdacb9b50ebb37b5db1bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-091-2/+2
| | | | | Change-Id: Ic599931b6af2560b9964d6a20cfc05cd4b0b777c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-081-2/+2
| | | | | Change-Id: I9ad67889937496675c71a0b0999b27d41c681c26 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-061-2/+2
| | | | | Change-Id: Ic5f625c038ec4d6c5ff6db3862d17af2702b3cd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-11-021-2/+2
| | | | | Change-Id: Ifd3dd35b38aabc4a134ff6ab5c6f15ac06189701 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QCanDbcFileParser: clarify that parse() expects the files to be UTF-8Ivan Solovev2023-11-011-0/+4
| | | | | | | Task-number: QTBUG-115281 Pick-to: 6.6 6.5 Change-Id: Idd456cc28f616a40f152017e54209f3d436684e0 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-311-2/+2
| | | | | Change-Id: Ic7bdf0c88a792e03dca0699447a0cfd19539d72c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-301-2/+2
| | | | | Change-Id: I42410eafd1a6198353ecef186d05e165a6ee5b1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-271-2/+2
| | | | | Change-Id: Ia1cfb2861b9bdf8379c27f83e40ad38dcbf17b6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-261-2/+2
| | | | | Change-Id: If98656ad59069c5d9b08f3d6e5e927154166bc87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-251-2/+2
| | | | | Change-Id: I8e0bd58606aef4554e4143fcb63574d0a1295f9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-241-2/+2
| | | | | Change-Id: I16882deb96c9307c32813d154c779bb20b97fd99 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-201-2/+2
| | | | | Change-Id: Ie873155c98d59e2f4af121ed64c7a826e4d930a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QModbusPdu: remove Q_DECLARE_TYPEINFOsMarc Mutz2023-10-181-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the nested enums, they're already marked as primitive by the primary template, by way of being enums. For the class itself, the class is neither copy- nor movable, so it shouldn't be marked as trivially relocatable, either. I have a QtCore change lined up that statically asserts that relocatable types are actually copyable or movable, and this is holding it up. It's a public class, though, so we need to be mindful of SC and BC: For SC, Q_DECLARE_TYPEINFO never really applied. Yes, you can construct situations where a user statically asserted that this type was trivially relocatable, but that's SiC Type A: they just need to remove the assertion. For BC, Qt no longer has types that change layout based on QTypeInfo (hello, Q5List), but user code might, but that's their problem. If existing code used trivial relocatability (memmove instead of move + destroy), it can continue to do so, no change there. New code will not have that optimization, but they're equivalent, as long as relocations happen atomically in one or the other way. Qt doesn't leak which type of relocation is chosen between functions (by passing a bool parameter to a function, e.g.); any use of QTypeInfo is contained within the function that uses it. If users leak it, that's again their problem. But we should document it, so: [ChangeLog][QtSerialBus][Potentially Source-Incompatible Changes][QModbusPdu] The class and its subclasses are no longer marked as Q_RELOCATABLE_TYPE. For the subclasses, if the base class isn't Q_RELOCATABLE_TYPE, they shouldn't be, either. Change-Id: I95940b5db978f4f0ab23fda21abfed55d392ea49 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-171-2/+2
| | | | | Change-Id: Ia1af125ffc978ac63b05a178a59ba766acfbb2f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-131-2/+2
| | | | | Change-Id: If09e035ef9949b4a8b6e625ef57c556589655aa1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Include what you need: <QPointer>Marc Mutz2023-10-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | All these TUs relied on transitive includes of qpointer.h, maybe to a large extent via qevent.h, though, given that qevent.h is more or less the only public QtBase header that includes qpointer.h, something else seems to be at play here. Said qevent.h actually needs QPointer in-name-only, so a forward declaration would suffice. Prepare for qevent.h dropping the include. The algorithm I used was: If the TU mentions 'passiveGrabbers', the name of the QEvent function that returns QPointers, and the TU doesn't have qpointer.h included explicitly, include it. That may produce False Positives, but better safe than sorry. Otherwise, in src/, add an include to all source and header files which mention QPointer. Exception: if foo.h of a foo.cpp already includes it, don't include again. Task-number: QTBUG-117670 Change-Id: Iec41618b4877a94432a7de4a2473f326cb70675a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-091-2/+2
| | | | | Change-Id: I18fb5708f2a8304c11a98e1661080c3ade7db191 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change Axivion configurationMatti Paaso2023-10-051-22/+3
| | | | | Change-Id: Id31dbfe044a97418a1e76f9905a4bac20d5ef55d Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-051-2/+2
| | | | | Change-Id: Ie2f4746f4d2f6f2c6932802c970f8a4295b90d6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-031-2/+2
| | | | | Change-Id: I44f5f0860b3c61ccd94519c03ee1dc9a7a063ea2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-10-021-2/+2
| | | | | Change-Id: I8de18f04f0bfe4eb78655ec47560a7b5ff2416e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* VectorCAN: Only return channels of type CANStefan Steinwasser2023-09-281-0/+2
| | | | | | | | This is only an CAN plugin so we need to check the channel type. If it is LIN or FlexRay do not add it to the channel list. Change-Id: Id378611e996ee72481fd5ecf571c76910738800c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-09-281-2/+2
| | | | | Change-Id: Ic8925668e83efa5806893788fddcf631518b289f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Extend list of highlighted Connectivity examplesKai Köhne2023-09-261-0/+5
| | | | | | | Pick-to: 6.5 6.6 6.6.0 Task-number: QTBUG-117221 Change-Id: Ib5ce8878fa7e4a12dae155013dc714331ecf5340 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* VectorCAN: Fix CAN-FD frame reading and sendingStefan Steinwasser2023-09-262-15/+110
| | | | | | | | | | | | | | | | | | | When setting the CAN device to flexible data rate mode the correct sampling point has to be set. When invalid CAN-FD configuration is set, respond with correct error instead of always complain about open port. When the bit rate switch is set for the sending frame, also set the corresponding Vector flag. Also set it to QCanBusFrame when receiving from Vector backend. When an payload higher than 8 is used, the DLC has to be set to the correct indexes. Fixes: QTBUG-99259 Change-Id: I07e91c74078be86de1c27f8c41a9b7709c9f9c48 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Update dependencies on 'dev' in qt/qtserialbusQt Submodule Update Bot2023-09-261-2/+2
| | | | | Change-Id: I0d3145d4cd41581a45ab48e9de8269e3916a69a0 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-09 10:37:01 +0000