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

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

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 88702cc87c

Pick-to: 6.7
Task-number: QTBUG-125859
Change-Id: I3472d3bd489f16175d04ef6198522b060fa6150a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 91f48cc4b77b1cfb5a4490c3bed3eb97edd2f85a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Edward Welbourne 2024-08-02 11:09:02 +02:00 committed by Qt Cherry-pick Bot
parent 46ac560d0a
commit 88f3fd0f75
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

@ -192,12 +192,12 @@ private:
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
{
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
qint64 jd;