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

Fix #if-ery on QDate::stdSysDaysToJulianDay()

Browse Source 
It relies on QT6_CALL_NEW_OVERLOAD_TAIL hence on QT6_ONLY, which is
inactive in bootstrap builds (they're treated as Qt 7). Thanks to
Ahmad Samir for reporting the resulting compiler warning at API change
review.  Amends commit 88702cc87cf830b145c8bff5174748e3719364f9

Pick-to: 6.8 6.7
Task-number: QTBUG-125859
Change-Id: I3472d3bd489f16175d04ef6198522b060fa6150a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Edward Welbourne 2024-08-02 11:09:02 +02:00
parent ea0f8cee55
commit 91f48cc4b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/time/qdatetime.h
View File

@ -195,12 +195,12 @@ private:
return unixEpochJd() + epochDays; return unixEpochJd() + epochDays;
} }
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION_MAJOR < 7 && !defined(QT_BOOTSTRAPPED)
static constexpr qint64 stdSysDaysToJulianDay(const std::chrono::sys_days &days) noexcept static constexpr qint64 stdSysDaysToJulianDay(const std::chrono::sys_days &days) noexcept
{ {
return stdSysDaysToJulianDay(days QT6_CALL_NEW_OVERLOAD_TAIL); return stdSysDaysToJulianDay(days QT6_CALL_NEW_OVERLOAD_TAIL);
} }
#endif // QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #endif // Qt < 7 and not bootstrapped
#endif // __cpp_lib_chrono >= 201907L #endif // __cpp_lib_chrono >= 201907L
qint64 jd; qint64 jd;