diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/tools/qrect.cpp | 8 | ||||
-rw-r--r-- | src/corelib/tools/qstringlist.cpp | 9 | ||||
-rw-r--r-- | src/corelib/tools/qstringlist.h | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 40d6c8b7c3..ad1885e8ce 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() function @@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. For example the left(), setLeft() and moveLeft() functions as an @@ -1335,7 +1335,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() @@ -1418,7 +1418,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. For example: the bottom(), setBottom() and moveBottom() functions: diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index c85a4f41dd..cf150c2a1b 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -335,6 +335,15 @@ static bool stringList_contains(const QStringList &stringList, const T &str, Qt: */ #endif +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/// Not really needed anymore, but kept for binary compatibility +bool QtPrivate::QStringList_contains(const QStringList *that, const QString &str, + Qt::CaseSensitivity cs) +{ + return stringList_contains(*that, str, cs); +} +#endif + /*! \fn bool QStringList::contains(QStringView str, Qt::CaseSensitivity cs) const \overload diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index b04b7c0bc8..10cbad04d6 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -164,6 +164,9 @@ namespace QtPrivate { QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); +#endif bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QStringView str, Qt::CaseSensitivity cs); bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, QLatin1String str, Qt::CaseSensitivity cs); void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QString &before, const QString &after, |