From f4f2a99e0672746bd2ad596456edbdca33915e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 12 Dec 2022 12:21:57 +0100 Subject: [PATCH] Bootstrap: Fix compilation of decl/def with different conditionals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By making their conditionals the same Change-Id: I2f1663480103fdfb0c156fc3da2da8d69651824a Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot (cherry picked from commit 24e4fb34cdabf1d1d1d25b79edac03740b274549) Reviewed-by: Mårten Nordheim --- src/corelib/time/qdatetime.h | 2 +- src/corelib/time/qtimezone.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index da7a28af3cb..240fcc06328 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -458,7 +458,7 @@ public: return result.addMSecs(time.time_since_epoch().count()); } -#if QT_CONFIG(timezone) +#if QT_CONFIG(timezone) && (__cpp_lib_chrono >= 201907L || defined(Q_QDOC)) // zoned_time. defined in qtimezone.h QT_POST_CXX17_API_IN_EXPORTED_CLASS static QDateTime fromStdZonedTime(const std::chrono::zoned_time< diff --git a/src/corelib/time/qtimezone.h b/src/corelib/time/qtimezone.h index 6e7ee0bb026..4006e673e76 100644 --- a/src/corelib/time/qtimezone.h +++ b/src/corelib/time/qtimezone.h @@ -256,7 +256,7 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &ds, QTimeZone &tz); Q_CORE_EXPORT QDebug operator<<(QDebug dbg, const QTimeZone &tz); #endif -#if __cpp_lib_chrono >= 201907L +#if QT_CONFIG(timezone) && __cpp_lib_chrono >= 201907L // zoned_time template // QT_POST_CXX17_API_IN_EXPORTED_CLASS inline QDateTime QDateTime::fromStdZonedTime(const std::chrono::zoned_time<