From 63d6012b03e5c85000d52ce735c848dd814cf1de Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 14 Mar 2024 15:13:58 +0100 Subject: Condition inline fromString() definitions on datestring feature 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 (cherry picked from commit 1618ff825c2198705fedde9c284a0c52bcce5b89) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 28911a81d4bc109c740919c3c952ef9096946d4d) --- src/corelib/time/qdatetime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3