diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index bbf406c5e35..33bb2baeb4b 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -700,7 +700,7 @@ QCborError QCborStreamReader::lastError() return std::as_const(*this).lastError(); } -#include "qdatetime.h" +#include "qdatetime.h" // also inlined API QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone) : QDateTime(date, time, timeZone, TransitionResolution::LegacyBehavior) {} diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index 50cad473009..460dc15a697 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -35,28 +35,28 @@ public: #if __cpp_lib_chrono >= 201907L || defined(Q_QDOC) QT_POST_CXX17_API_IN_EXPORTED_CLASS Q_IMPLICIT constexpr QDate(std::chrono::year_month_day date) noexcept - : jd(date.ok() ? stdSysDaysToJulianDay(date QT6_CALL_NEW_OVERLOAD_TAIL) : nullJd()) + : jd(date.ok() ? stdSysDaysToJulianDay(date) : nullJd()) {} QT_POST_CXX17_API_IN_EXPORTED_CLASS Q_IMPLICIT constexpr QDate(std::chrono::year_month_day_last date) noexcept - : jd(date.ok() ? stdSysDaysToJulianDay(date QT6_CALL_NEW_OVERLOAD_TAIL) : nullJd()) + : jd(date.ok() ? stdSysDaysToJulianDay(date) : nullJd()) {} QT_POST_CXX17_API_IN_EXPORTED_CLASS Q_IMPLICIT constexpr QDate(std::chrono::year_month_weekday date) noexcept - : jd(date.ok() ? stdSysDaysToJulianDay(date QT6_CALL_NEW_OVERLOAD_TAIL) : nullJd()) + : jd(date.ok() ? stdSysDaysToJulianDay(date) : nullJd()) {} QT_POST_CXX17_API_IN_EXPORTED_CLASS Q_IMPLICIT constexpr QDate(std::chrono::year_month_weekday_last date) noexcept - : jd(date.ok() ? stdSysDaysToJulianDay(date QT6_CALL_NEW_OVERLOAD_TAIL) : nullJd()) + : jd(date.ok() ? stdSysDaysToJulianDay(date) : nullJd()) {} QT_POST_CXX17_API_IN_EXPORTED_CLASS static constexpr QDate fromStdSysDays(const std::chrono::sys_days &days) noexcept { - return QDate(stdSysDaysToJulianDay(days QT6_CALL_NEW_OVERLOAD_TAIL)); + return QDate(stdSysDaysToJulianDay(days)); } QT_POST_CXX17_API_IN_EXPORTED_CLASS @@ -177,9 +177,11 @@ private: static constexpr inline qint64 unixEpochJd() { return Q_INT64_C(2440588); } #if __cpp_lib_chrono >= 201907L +#if !QT_CORE_REMOVED_SINCE(6, 7) QT_POST_CXX17_API_IN_EXPORTED_CLASS +#endif static constexpr qint64 - stdSysDaysToJulianDay(const std::chrono::sys_days &days QT6_DECL_NEW_OVERLOAD_TAIL) noexcept + stdSysDaysToJulianDay(const std::chrono::sys_days &days) noexcept { const auto epochDays = days.time_since_epoch().count(); // minJd() and maxJd() fit into 40 bits. @@ -191,13 +193,6 @@ private: } return unixEpochJd() + epochDays; } - -#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 < 7 and not bootstrapped #endif // __cpp_lib_chrono >= 201907L qint64 jd;