whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 32-bit builds broken by mul_overflow() on qint64 

Use std::integral_constant to avoid instantiating QIntegerForSize<16>,
caused by 2b26dea51b

Change-Id: Ia6f49a1dcd82835c7e76200a650767fc519eab90
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Martin Storsjö 2021-11-10 18:38:50 +02:00 committed by Edward Welbourne
parent 3ba1a196aa
commit d7d9451361
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/time/qtimezoneprivate_win.cpp
View File

@ -280,7 +280,7 @@ QDate calculateTransitionLocalDate(const SYSTEMTIME &rule, int year)
inline bool timeToMSecs(QDate date, QTime time, qint64 *msecs)
{
qint64 dayms = 0;
return mul_overflow(date.toJulianDay() - JULIAN_DAY_FOR_EPOCH, qint64(MSECS_PER_DAY), &dayms)
return mul_overflow(date.toJulianDay() - JULIAN_DAY_FOR_EPOCH, std::integral_constant<qint64, MSECS_PER_DAY>(), &dayms)
|| add_overflow(dayms, qint64(time.msecsSinceStartOfDay()), msecs);
}