1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set tm_isdst = -1 before calling mktime()

Browse Source 
Leaving it set to 0 will cause mktime() to interpret other fields as
in standard time, potentially "correcting" them and tm_isdst to
represent the equivalent moment in daylight-saving time. Set it to -1
to tell mktime() to let the system work out whether the time is
standard or daylight-saving.

Change-Id: Id33d4cb0afdb14f236ca5ce04cf605610a30d712
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2021-10-08 13:20:28 +02:00
parent 299f016b5d
commit 04419c2852
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/time/qdatetime.cpp
View File

@ -2726,6 +2726,7 @@ static auto computeSystemMillisRange()
local.tm_year = tmYearFromQYear(1901);
local.tm_mon = 11;
local.tm_mday = 15; // A day and a bit after the start of 32-bit time_t:
local.tm_isdst = -1;
return R{qMkTime(&local) == -1 ? 0 : msecsMin, msecsMax, false, false};
} else {
const struct { int year; qint64 millis; } starts[] = {
@ -2754,6 +2755,7 @@ static auto computeSystemMillisRange()
local.tm_mday = 31;
local.tm_hour = 23;
local.tm_min = local.tm_sec = 59;
local.tm_isdst = -1;
if (qMkTime(&local) != -1) {
stop = c.millis;
break;
@ -2766,6 +2768,7 @@ static auto computeSystemMillisRange()
local.tm_year = tmYearFromQYear(c.year);
local.tm_mon = 1;
local.tm_mday = 1;
local.tm_isdst = -1;
if (qMkTime(&local) != -1)
return R{c.millis, stop, startMin, stopMax};
startMin = false;