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

Bootstrap: Fix compilation of decl/def with different conditionals

Browse Source 
By making their conditionals the same

Change-Id: I2f1663480103fdfb0c156fc3da2da8d69651824a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 24e4fb34cdabf1d1d1d25b79edac03740b274549)
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Mårten Nordheim 2022-12-12 12:21:57 +01:00
parent 78adb1eded
commit f4f2a99e06
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<

2
src/corelib/time/qtimezone.h
View File

@ -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 <typename> // QT_POST_CXX17_API_IN_EXPORTED_CLASS
inline QDateTime QDateTime::fromStdZonedTime(const std::chrono::zoned_time<