diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2020-10-15 13:37:11 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2020-10-15 14:25:02 +0200 |
commit | 5aad121baf7db08c2ebc7ef5f12cc873b15598cd (patch) | |
tree | 773e2c90a1637ccfc78f546a65c0a17ddc81eeba /src/plugins | |
parent | 44dc13f3adfb2ac7d3a32178fb496376671541fa (diff) |
Push to more recent qtbase/qtserialport checkout
and fix resulting compile breaks.
Change-Id: I3d8e15723eb86ec91552f93bb7a5de46858c0495
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 98ffbf1..d3383f2 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -355,7 +355,7 @@ void TinyCanBackendPrivate::startWrite() TCanMsg message = {}; if (Q_UNLIKELY(payload.size() > int(sizeof(message.Data.Bytes)))) { - qCWarning(QT_CANBUS_PLUGINS_TINYCAN, "Cannot write frame with payload size %d.", payload.size()); + qCWarning(QT_CANBUS_PLUGINS_TINYCAN, "Cannot write frame with payload size %d.", int(payload.size())); } else { message.Id = frame.frameId(); message.Flags.Flag.Len = payload.size(); |