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 | |
| 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>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbuspdu.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 482b0e0..f2fb88d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: e278d721920c6bf2b05b0fa36e2097f691451a4a + ref: 871392790eafdd22521367ba485da5c10e9bb0db required: true ../qtserialport: - ref: 15cbfd5a0b3c729f1e5f2b456fb701c23fe3f898 + ref: cfc375388d6f38374984b1cf46e61606c8360335 required: false 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(); diff --git a/src/serialbus/qmodbuspdu.h b/src/serialbus/qmodbuspdu.h index c0c2117..5d68031 100644 --- a/src/serialbus/qmodbuspdu.h +++ b/src/serialbus/qmodbuspdu.h @@ -37,6 +37,7 @@ #define QMODBUSPDU_H #include <QtCore/qdatastream.h> +#include <QtCore/qiodevice.h> #include <QtCore/qlist.h> #include <QtCore/qmetatype.h> #include <QtSerialBus/qtserialbusglobal.h> |