diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-03-14 15:13:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-19 05:13:38 +0000 |
| commit | 63d6012b03e5c85000d52ce735c848dd814cf1de (patch) | |
| tree | 05af27cd3be00b30fb3530a350dade46c1192fe9 | |
| parent | dbda7d2f8b68b32ff580fc386ad32d0cad459dbd (diff) | |
Condition inline fromString() definitions on datestring featurev6.7.0-rc2
Amends commit 41f84f3ddb780ec751e3fc706dd242fc4a99de7a - QDate and
QDateTime declare fromString() methods only when feature datestring is
enabled. So their inline implementations should also be conditioned on
that feature.
Change-Id: I84fc877001d3fc97c6ca149864e4ad5a2dbabe87
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 1618ff825c2198705fedde9c284a0c52bcce5b89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 28911a81d4bc109c740919c3c952ef9096946d4d)
| -rw-r--r-- | src/corelib/time/qdatetime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index 1474e2c6f4..f8a9360fbb 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -640,7 +640,7 @@ Q_CORE_EXPORT size_t qHash(const QDateTime &key, size_t seed = 0); Q_CORE_EXPORT size_t qHash(QDate key, size_t seed = 0) noexcept; Q_CORE_EXPORT size_t qHash(QTime key, size_t seed = 0) noexcept; -#if QT_CORE_INLINE_IMPL_SINCE(6, 7) +#if QT_CONFIG(datestring) && QT_CORE_INLINE_IMPL_SINCE(6, 7) QDate QDate::fromString(const QString &string, QStringView format, QCalendar cal) { return fromString(string, format, QLocale::DefaultTwoDigitBaseYear, cal); |