summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-07 14:45:42 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-09-10 03:16:34 +0200
commitbbec7aaf3a8cf81f28810db2270c787cc9910268 (patch)
tree1a9fc258a1f7bddd3d9ff271eb9a928694363656 /src/corelib/serialization
parentd49a7412f55390e461773f4ffc36a82958d59b6d (diff)
Fix a number of MSVC integer conversion warnings
Mostly related to qstrlen(). Change-Id: I69e2052c83766e4fc466ed398d0d0eac011a77ec Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r--src/corelib/serialization/qdatastream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index dddce6075f..c490bfa70d 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -1361,7 +1361,7 @@ QDataStream &QDataStream::operator<<(const char *s)
*this << (quint32)0;
return *this;
}
- uint len = qstrlen(s) + 1; // also write null terminator
+ int len = int(qstrlen(s)) + 1; // also write null terminator
*this << (quint32)len; // write length specifier
writeRawData(s, len);
return *this;