summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-10-06 18:45:07 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2016-12-12 13:59:07 +0000
commitc237a8d76fbc073d6dc61c4ee6e563a36a54f665 (patch)
treeabfe136a824c876b3a4d9d351b147aaab9f01d32 /src/corelib
parentaa06ea0d8b3d63b8a936da57df61ca258307c927 (diff)
QTzTimeZonePrivate: don't assume int is a 4-byte type
It probably is today, but when the I/O we're doing is explicit about how many bytes it eats, make sure we're using an explicitly 4-byte type, qint32. Change-Id: I48a35fe58043368cdfd096e2628bba410d94ceaa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qtimezoneprivate_tz.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index f5ab1a1deb..747c0042dd 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -199,7 +199,7 @@ static QVector<QTzTransition> parseTzTransitions(QDataStream &ds, int tzh_timecn
}
} else {
// Parse tzh_timecnt x 4-byte transition times
- int val;
+ qint32 val;
for (int i = 0; i < tzh_timecnt && ds.status() == QDataStream::Ok; ++i) {
ds >> val;
transitions[i].tz_time = val;