diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:03 +0100 |
| commit | 2caa6e1ca0094b2e2a4cd6005836d46a7ddfdf6a (patch) | |
| tree | e2653c5aeda85ef44a174a467319b8142aa958bf /src/plugins/canbus/socketcan | |
| parent | 0f33c698229ebb418b71a19dd409e2b5a417182e (diff) | |
| parent | 50e4edb4b23947f9fcdb99ea0101660f0752cc1f (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ia04f54eee1264b659d8928b7f08d7221f587bc54
Diffstat (limited to 'src/plugins/canbus/socketcan')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index ddda3a9..b43787d 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -433,7 +433,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData) if (newData.frameType() == QCanBusFrame::RemoteRequestFrame) { canId |= CAN_RTR_FLAG; } else if (newData.frameType() == QCanBusFrame::ErrorFrame) { - canId = (uint)(newData.error() & QCanBusFrame::AnyError); + canId = static_cast<canid_t>((newData.error() & QCanBusFrame::AnyError)); canId |= CAN_ERR_FLAG; } |