From addbb45e5422976ca4ed73e4b63df3424e4dff17 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 5 Jun 2024 18:40:50 +0200 Subject: [PATCH] Add missing feature checks in removed API The #if-ery on the removed API's definition still needs to match its declaration. Spotted by Axivion. Pick-to: 6.7 Task-number: QTBUG-122619 Change-Id: I4e3dc03291a8fb7fbc01065bce8e5dc58a051166 Reviewed-by: Ivan Solovev (cherry picked from commit 76f82b8f1334d8a377630876ef2d9681c05d7ee8) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/compat/removed_api.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index b8f208e82ec..95f9d137b3a 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -586,6 +586,8 @@ void QThreadPool::startOnReservedThread(std::function functionToRun) #endif // QT_CONFIG(thread) +#if QT_CONFIG(xmlstream) + #include "qxmlstream.h" QStringView QXmlStreamAttributes::value(const QString &namespaceUri, const QString &name) const @@ -613,6 +615,8 @@ QStringView QXmlStreamAttributes::value(QLatin1StringView qualifiedName) const return value(QAnyStringView(qualifiedName)); } +#endif // xmlstream + // inlined API #if QT_CONFIG(thread) #include "qmutex.h" @@ -779,6 +783,8 @@ QString QLocale::bcp47Name() const return bcp47Name(TagSeparator::Dash); } +#if QT_CONFIG(datestring) + QDate QLocale::toDate(const QString &string, FormatType format) const { return toDate(string, dateFormat(format), DefaultTwoDigitBaseYear); @@ -819,6 +825,8 @@ QDateTime QLocale::toDateTime(const QString &string, const QString &format, QCal return toDateTime(string, format, cal, DefaultTwoDigitBaseYear); } +#endif // datestring + #include "qobject.h" void qt_qFindChildren_helper(const QObject *parent, const QMetaObject &mo,