diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2021-07-23 09:03:55 +0200 |
---|---|---|
committer | Andre Hartmann <aha_1980@gmx.de> | 2021-07-23 13:23:23 +0200 |
commit | 3b2ce7c739ca2bb5b47d26fc1b0ee4294f49f0a4 (patch) | |
tree | 0a15ddffbbcfdddd84d1ed02d13c2c0ea0264d72 /src/plugins/canbus/peakcan | |
parent | 12efd9d9199caddda31aefad899bbdc7cfec81d2 (diff) |
QCanBusDeviceInfo: Add method to obtain the plugin name
[ChangeLog][QCanBusDeviceInfo] Added the CAN bus
plugin name to QCanBusDeviceInfo.
Custom plugins must be adopted to the changed
QCanBusDevice::createDeviceInfo() method.
Pick-to: 6.2
Change-Id: I44d658aaa6f873eecce447dd9ee4539c9fbe2043
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/canbus/peakcan')
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index b725702..2139110 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -161,7 +161,8 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByChannelCondition() if (idStat == PCAN_ERROR_OK) alias = QString::number(deviceId); - result.append(createDeviceInfo(QLatin1String(pcanChannels[i].name), + result.append(createDeviceInfo(QStringLiteral("peakcan"), + QLatin1String(pcanChannels[i].name), QString(), QLatin1String(description), alias, channel, false, isFd)); } @@ -208,7 +209,8 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfacesByAttachedChannels(bool *ok) const int channel = info.controller_number; const bool isCanFd = (info.device_features & FEATURE_FD_CAPABLE); - result.append(createDeviceInfo(name, QString(), description, alias, + result.append(createDeviceInfo(QStringLiteral("peakcan"), name, QString(), + description, alias, channel, false, isCanFd)); } } |