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

Add missing feature checks in removed API

Browse Source 
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 <ivan.solovev@qt.io>
(cherry picked from commit 76f82b8f1334d8a377630876ef2d9681c05d7ee8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2024-06-05 18:40:50 +02:00 committed by Qt Cherry-pick Bot
parent 555cbb3976
commit addbb45e54
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/compat/removed_api.cpp
View File

@ -586,6 +586,8 @@ void QThreadPool::startOnReservedThread(std::function<void()> 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,