Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-serialbus for openSUSE:Factory checked in at 2023-07-26 13:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialbus (Old) and /work/SRC/openSUSE:Factory/.qt6-serialbus.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-serialbus" Wed Jul 26 13:22:53 2023 rev:16 rq:1100009 version:6.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialbus/qt6-serialbus.changes 2023-07-08 22:47:35.823287031 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-serialbus.new.15225/qt6-serialbus.changes 2023-07-26 13:23:27.759829048 +0200 @@ -1,0 +2,6 @@ +Thu Jul 20 09:07:13 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.2 + * https://www.qt.io/blog/qt-6.5.2-released-1 + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-6.5.1.tar.xz New: ---- qtserialbus-everywhere-src-6.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialbus.spec ++++++ --- /var/tmp/diff_new_pack.8Tw9UP/_old 2023-07-26 13:23:28.467833055 +0200 +++ /var/tmp/diff_new_pack.8Tw9UP/_new 2023-07-26 13:23:28.471833078 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.1 +%define real_version 6.5.2 %define short_version 6.5 %define tar_name qtserialbus-everywhere-src %define tar_suffix %{nil} @@ -27,12 +27,12 @@ %endif # Name: qt6-serialbus -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Qt 6 SerialBus library License: LGPL-3.0-only OR GPL-2.0-or-later URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source: https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-serialbus-rpmlintrc BuildRequires: fdupes BuildRequires: pkgconfig ++++++ qtserialbus-everywhere-src-6.5.1.tar.xz -> qtserialbus-everywhere-src-6.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/.cmake.conf new/qtserialbus-everywhere-src-6.5.2/.cmake.conf --- old/qtserialbus-everywhere-src-6.5.1/.cmake.conf 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/.cmake.conf 2023-07-07 05:56:43.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.1") +set(QT_REPO_MODULE_VERSION "6.5.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/.tag new/qtserialbus-everywhere-src-6.5.2/.tag --- old/qtserialbus-everywhere-src-6.5.1/.tag 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/.tag 2023-07-07 05:56:43.000000000 +0200 @@ -1 +1 @@ -c49440f30d9990f1da6c5cab6e7bd06dbf45c01c +eb930cf333c6cc07f7c34fcbf5bf40620e381b08 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/CMakeLists.txt new/qtserialbus-everywhere-src-6.5.2/CMakeLists.txt --- old/qtserialbus-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07 05:56:43.000000000 +0200 @@ -41,5 +41,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets SerialPort) +qt_internal_project_setup() qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/conanfile.py new/qtserialbus-everywhere-src-6.5.2/conanfile.py --- old/qtserialbus-everywhere-src-6.5.1/conanfile.py 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/conanfile.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -from conans import ConanFile -import re -from pathlib import Path -from typing import Dict, Any - -_qtserialbus_features = ["modbus-serialport"] - - -def _parse_qt_version_by_key(key: str) -> str: - with open(Path(__file__).parent.resolve() / ".cmake.conf") as f: - m = re.search(fr'{key} .*"(.*)"', f.read()) - return m.group(1) if m else "" - - -def _get_qt_minor_version() -> str: - return ".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2]) - - -class QtSerialBus(ConanFile): - name = "qtserialbus" - license = "LGPL-3.0, GPL-2.0+, Commercial Qt License Agreement" - author = "The Qt Company <https://www.qt.io/contact-us>" - url = "https://code.qt.io/cgit/qt/qtserialbus.git"; - description = ( - "The Qt Serial Bus API provides classes and functions to access the various " - "industrial serial buses and protocols, such as CAN, ModBus, and others. " - ) - topics = "qt", "qt6", "qtserialbus", "serialbus", "CAN", "ModBus" - settings = "os", "compiler", "arch", "build_type" - # for referencing the version number and prerelease tag and dependencies info - exports = ".cmake.conf", "dependencies.yaml" - exports_sources = "*", "!conan*.*" - python_requires = f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere" - python_requires_extend = "qt-conan-common.QtLeafModule" - - def get_qt_leaf_module_options(self) -> Dict[str, Any]: - """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return self._shared.convert_qt_features_to_conan_options(_qtserialbus_features) - - def get_qt_leaf_module_default_options(self) -> Dict[str, Any]: - """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return self._shared.convert_qt_features_to_default_conan_options(_qtserialbus_features) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/dependencies.yaml new/qtserialbus-everywhere-src-6.5.2/dependencies.yaml --- old/qtserialbus-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/dependencies.yaml 2023-07-07 05:56:43.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e + ref: af457a9f0f7eb1a2a7d11f495da508faab91a442 required: true ../qtserialport: - ref: 957a2fc15c59b9064c492ad9362b254274d25992 + ref: b2321a679ed4d702b0551539e416b4bc90fae6c6 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/src/serialbus/doc/src/peakcan.qdoc new/qtserialbus-everywhere-src-6.5.2/src/serialbus/doc/src/peakcan.qdoc --- old/qtserialbus-everywhere-src-6.5.1/src/serialbus/doc/src/peakcan.qdoc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/src/serialbus/doc/src/peakcan.qdoc 2023-07-07 05:56:43.000000000 +0200 @@ -14,6 +14,10 @@ (libpcanbasic.so). On macOS the plugin requires the PCBUSB library from \l{http://www.mac-can.com}{UV Software}, version is 0.9 or higher. + \note The Qt versions 5.14 to 6.4 are only compatible to PCBUSB library + version 0.8.1, but Qt versions 6.5 and higher requires a PCBUSB + version 0.9 upwards. + \note QCanBusDeviceInfo::alias() is only supported on Windows and with PCAN-Basic 4.4.0 or higher. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/src/serialbus/qcandbcfileparser.cpp new/qtserialbus-everywhere-src-6.5.2/src/serialbus/qcandbcfileparser.cpp --- old/qtserialbus-everywhere-src-6.5.1/src/serialbus/qcandbcfileparser.cpp 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/src/serialbus/qcandbcfileparser.cpp 2023-07-07 05:56:43.000000000 +0200 @@ -12,6 +12,8 @@ #include <QtCore/QFile> #include <QtCore/QRegularExpression> +#include <optional> + QT_BEGIN_NAMESPACE /*! @@ -408,6 +410,15 @@ return true; } +static std::optional<QtCanBus::UniqueId> extractUniqueId(QStringView view) +{ + bool ok = false; + const uint value = view.toUInt(&ok); + if (ok) + return QtCanBus::UniqueId{value & 0x1FFFFFFF}; + return std::nullopt; +} + /*! \internal Returns \c false only in case of hard error. Returns \c true even if some @@ -457,16 +468,15 @@ QCanMessageDescription desc; desc.setName(match.captured(u"name"_s)); - bool ok = false; - - const QtCanBus::UniqueId id{match.capturedView(u"messageId"_s).toUInt(&ok)}; - if (ok) { - desc.setUniqueId(id); + const auto id = extractUniqueId(match.capturedView(u"messageId"_s)); + if (id.has_value()) { + desc.setUniqueId(id.value()); } else { addWarning(QObject::tr("Failed to parse frame id for message %1").arg(desc.name())); return {}; } + bool ok = false; const auto size = match.capturedView(u"size"_s).toUInt(&ok); if (ok) { desc.setSize(size); @@ -659,18 +669,19 @@ m_lineOffset = match.capturedEnd(0); - bool ok = false; - const QtCanBus::UniqueId uid{match.capturedView(u"messageId"_s).toUInt(&ok)}; - if (!ok) { + const auto uidOptional = extractUniqueId(match.capturedView(u"messageId"_s)); + if (!uidOptional) { addWarning(QObject::tr("Failed to parse frame id from string %1").arg(data)); return; } + const QtCanBus::UniqueId uid = uidOptional.value(); auto msgDesc = m_messageDescriptions.value(uid); if (msgDesc.isValid()) { const QString sigName = match.captured(u"sigName"_s); auto sigDesc = msgDesc.signalDescriptionForName(sigName); if (sigDesc.isValid()) { + bool ok = false; const auto type = match.capturedView(u"type").toUInt(&ok); if (ok) { bool sigDescChanged = false; @@ -742,13 +753,13 @@ const auto type = match.capturedView(u"type"_s); - bool ok = false; - const QtCanBus::UniqueId uid{match.capturedView(u"messageId"_s).toUInt(&ok)}; - if (!ok) { + const auto uidOptional = extractUniqueId(match.capturedView(u"messageId"_s)); + if (!uidOptional) { addWarning(QObject::tr("Failed to parse frame id from string %1").arg(data)); return; } + const QtCanBus::UniqueId uid = uidOptional.value(); auto messageDesc = m_messageDescriptions.value(uid); if (!messageDesc.isValid()) { addWarning(QObject::tr("Failed to find message description for unique id %1. " @@ -806,13 +817,13 @@ m_lineOffset = match.capturedEnd(0); - bool ok = false; - const QtCanBus::UniqueId uid{match.capturedView(u"messageId"_s).toUInt(&ok)}; - if (!ok) { + const auto uidOptional = extractUniqueId(match.capturedView(u"messageId"_s)); + if (!uidOptional) { addWarning(QObject::tr("Failed to parse frame id from string %1").arg(data)); return; } + const QtCanBus::UniqueId uid = uidOptional.value(); auto messageDesc = m_messageDescriptions.value(uid); if (!messageDesc.isValid()) { addWarning(QObject::tr("Failed to find message description for unique id %1. " @@ -906,13 +917,13 @@ m_lineOffset = match.capturedEnd(0); - bool ok = false; - const QtCanBus::UniqueId uid{match.capturedView(u"messageId"_s).toUInt(&ok)}; - if (!ok) { + const auto uidOptional = extractUniqueId(match.capturedView(u"messageId"_s)); + if (!uidOptional) { addWarning(QObject::tr("Failed to parse value description from string %1").arg(data)); return; } + const QtCanBus::UniqueId uid = uidOptional.value(); // Check if the message exists const auto messageDesc = m_messageDescriptions.value(uid); if (!messageDesc.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/different_data_types.dbc new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/different_data_types.dbc --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/different_data_types.dbc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/different_data_types.dbc 2023-07-07 05:56:43.000000000 +0200 @@ -3,9 +3,9 @@ SG_ s1 : 12|12@1- (1,0) [0|0] "unit" Vector__XXX SG_ s2 : 24|32@1- (1,0) [0|0] "unit" Vector__XXX -BO_ 1235 Test1: 8 Vector__XXX +BO_ 2566844926 Test1: 8 Vector__XXX SG_ s3: 0|64@1+ (1,0) [0|0] "unit" Vector__XXX SIG_VALTYPE_ 1234 s1 : 0; SIG_VALTYPE_ 1234 s2: 1; -SIG_VALTYPE_ 1235 s3:2 ; +SIG_VALTYPE_ 2566844926 s3:2 ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/extended_multiplexing.dbc new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/extended_multiplexing.dbc --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/extended_multiplexing.dbc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/extended_multiplexing.dbc 2023-07-07 05:56:43.000000000 +0200 @@ -44,7 +44,7 @@ SG_ s0 M : 0|4@1+ (1,0) [0|0] "" Vector__XXX SG_ s5 : 16|8@1- (1,0) [0|0] "" Vector__XXX -BO_ 1235 Test: 3 Vector__XXX +BO_ 2566844926 Test: 3 Vector__XXX SG_ s4 m2 : 8|8@1- (1,0) [0|0] "" Vector__XXX SG_ s3 m1 : 8|8@1- (1,0) [0|0] "" Vector__XXX SG_ s2 m2 : 4|12@1- (1,0) [0|0] "" Vector__XXX @@ -82,10 +82,10 @@ SG_MUL_VAL_ 1234 s1 s0 1-1, 5-5, 9-9; CM_ "Typo in mux switch name"; -SG_MUL_VAL_ 1235 s4 s11 2-3, 5-5; -SG_MUL_VAL_ 1235 s3 s1 1-1; -SG_MUL_VAL_ 1235 s2 s0 2-4, 6-8, 10-10; -SG_MUL_VAL_ 1235 s1 s0 1-1, 5-5, 9-9; +SG_MUL_VAL_ 2566844926 s4 s11 2-3, 5-5; +SG_MUL_VAL_ 2566844926 s3 s1 1-1; +SG_MUL_VAL_ 2566844926 s2 s0 2-4, 6-8, 10-10; +SG_MUL_VAL_ 2566844926 s1 s0 1-1, 5-5, 9-9; CM_ "Typo in multiplexed signal name"; SG_MUL_VAL_ 1236 s6 s1 2-3, 5-5; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/message_signals_in_one_line.dbc new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/message_signals_in_one_line.dbc --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/message_signals_in_one_line.dbc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/message_signals_in_one_line.dbc 2023-07-07 05:56:43.000000000 +0200 @@ -1,7 +1,7 @@ BO_ 1234 Test : 7 Vector__XXX SG_ s0 : 0|12@1+ (1,0) [0|0] "unit" Vector__XXX SG_ s1 : 12|12@1- (1,0) [0|0] "unit" Vector__XXX SG_ s2 : 24|32@1- (1,0) [0|0] "unit" Vector__XXX -BO_ 1235 Test1: 8 Vector__XXX SG_ s3: 0|64@1+ (1,0) [0|0] "unit" Vector__XXX +BO_ 2566844926 Test1: 8 Vector__XXX SG_ s3: 0|64@1+ (1,0) [0|0] "unit" Vector__XXX SIG_VALTYPE_ 1234 s1 : 0; SIG_VALTYPE_ 1234 s2 : 1 ; -SIG_VALTYPE_ 1235 s3 : 2; +SIG_VALTYPE_ 2566844926 s3 : 2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/messages_with_comments.dbc new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/messages_with_comments.dbc --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/messages_with_comments.dbc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/messages_with_comments.dbc 2023-07-07 05:56:43.000000000 +0200 @@ -36,7 +36,7 @@ BU_: -BO_ 1235 Test1: 1 Vector__XXX +BO_ 2566844926 Test1: 1 Vector__XXX SG_ s2 : 7|8@0+ (1,0) [0|0] "unit" Vector__XXX BO_ 1234 Test: 2 Vector__XXX @@ -45,8 +45,8 @@ -CM_ BO_ 1235 "comment for Test1." ; -CM_ SG_ 1235 s2 "comment for s2" ; +CM_ BO_ 2566844926 "comment for Test1." ; +CM_ SG_ 2566844926 s2 "comment for s2" ; CM_ BO_ 1234 "Comment for message Test"; CM_ SG_ 1234 s1 "comment for s1" ; CM_ SG_ 1234 s0 "Comment for s0"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/value_descriptions.dbc new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/value_descriptions.dbc --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/data/value_descriptions.dbc 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/data/value_descriptions.dbc 2023-07-07 05:56:43.000000000 +0200 @@ -39,7 +39,7 @@ VAL_TABLE_ ValueTable0 2 "Description for the value '0x2'" 1 "Description for the value '0x1'" 0 "Description for the value '0x0'" ; -BO_ 1235 Test1: 2 Vector__XXX +BO_ 2566844926 Test1: 2 Vector__XXX SG_ s2 : 8|8@1+ (1,0) [0|0] "" Vector__XXX SG_ s1 : 0|8@1+ (1,0) [0|0] "" Vector__XXX @@ -48,13 +48,13 @@ SG_ s0 : 0|8@1+ (1,0) [0|0] "" Vector__XXX -VAL_ 1235 s2 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 "Value0" ; -VAL_ 1235 s1 5 "b" 4 "g" 3 "r" ; +VAL_ 2566844926 s2 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 "Value0" ; +VAL_ 2566844926 s1 5 "b" 4 "g" 3 "r" ; VAL_ 1234 s1 5 "blue" 4 "green" 3 "red" ; VAL_ 1234 s0 2 "Description for the value '0x2'" 1 "Description for the value '0x1'" 0 "Description for the value '0x0'" ; CM_ "Invalid descriptions go here"; VAL_ 1236 s2 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 "Value0" ; -VAL_ 1235 s3 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 "Value0" ; -VAL_ 1235 s2 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 ; +VAL_ 2566844926 s3 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 "Value0" ; +VAL_ 2566844926 s2 4 "Value4" 3 "Value3" 2 "Value2" 1 "Value1" 0 ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp --- old/qtserialbus-everywhere-src-6.5.1/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp 2023-05-16 09:14:06.000000000 +0200 +++ new/qtserialbus-everywhere-src-6.5.2/tests/auto/qcandbcfileparser/tst_qcandbcfileparser.cpp 2023-07-07 05:56:43.000000000 +0200 @@ -273,7 +273,7 @@ QCanMessageDescription doubleMessage = messageDesc; doubleMessage.clearSignalDescriptions(); doubleMessage.setName("Test1"); - doubleMessage.setUniqueId(QtCanBus::UniqueId{1235}); + doubleMessage.setUniqueId(QtCanBus::UniqueId{0x18fef1fe}); doubleMessage.setSize(8); signalDesc.setName("s3"); @@ -475,7 +475,7 @@ QCanMessageDescription doubleMessage = messageDesc; doubleMessage.clearSignalDescriptions(); doubleMessage.setName("Test1"); - doubleMessage.setUniqueId(QtCanBus::UniqueId{1235}); + doubleMessage.setUniqueId(QtCanBus::UniqueId{0x18fef1fe}); doubleMessage.setSize(8); signalDesc.setName("s3"); @@ -562,7 +562,7 @@ QCanMessageDescription otherDesc = messageDesc; otherDesc.clearSignalDescriptions(); otherDesc.setName("Test1"); - otherDesc.setUniqueId(QtCanBus::UniqueId{1235}); + otherDesc.setUniqueId(QtCanBus::UniqueId{0x18fef1fe}); otherDesc.setSize(1); otherDesc.setComment("comment for Test1."); @@ -711,10 +711,10 @@ u"Failed to find message description for unique id 12371. Skipping string " "SG_MUL_VAL_ 12371 s4 s1 2-3, 5-5;"_s, u"Failed to find signal description for signal s11. Skipping string " - "SG_MUL_VAL_ 1235 s4 s11 2-3, 5-5;"_s, + "SG_MUL_VAL_ 2566844926 s4 s11 2-3, 5-5;"_s, u"Failed to find signal description for signal s6. Skipping string " "SG_MUL_VAL_ 1236 s6 s1 2-3, 5-5;"_s, - u"Message description with unique id 1235 is skipped because it has invalid " + u"Message description with unique id 419361278 is skipped because it has invalid " "multiplexing description."_s, u"Message description with unique id 1236 is skipped because it has invalid " "multiplexing description."_s, @@ -971,15 +971,15 @@ QCanDbcFileParser::MessageValueDescriptions expectedDescriptions; expectedDescriptions.insert(QtCanBus::UniqueId{1234}, test_value_descriptions); - expectedDescriptions.insert(QtCanBus::UniqueId{1235}, test1_value_descriptions); + expectedDescriptions.insert(QtCanBus::UniqueId{0x18fef1fe}, test1_value_descriptions); const QStringList expectedWarnings { u"Failed to find message description for unique id 1236. Skipping string " "VAL_ 1236 s2 4 \"Value4\" 3 \"Value3\" 2 \"Value2\" 1 \"Value1\" 0 \"Value0\" ;"_s, u"Failed to find signal description for signal s3. Skipping string " - "VAL_ 1235 s3 4 \"Value4\" 3 \"Value3\" 2 \"Value2\" 1 \"Value1\" 0 \"Value0\" ;"_s, + "VAL_ 2566844926 s3 4 \"Value4\" 3 \"Value3\" 2 \"Value2\" 1 \"Value1\" 0 \"Value0\" ;"_s, u"Failed to parse value description from string " - "VAL_ 1235 s2 4 \"Value4\" 3 \"Value3\" 2 \"Value2\" 1 \"Value1\" 0 ;"_s + "VAL_ 2566844926 s2 4 \"Value4\" 3 \"Value3\" 2 \"Value2\" 1 \"Value1\" 0 ;"_s }; const QString fileName = u"value_descriptions.dbc"_s;
