diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 3 | ||||
| -rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 8851e08d4f..ffc3989815 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1560,12 +1560,12 @@ namespace Qt { MatchContains = 1, MatchStartsWith = 2, MatchEndsWith = 3, + MatchRegularExpression = 4, #if QT_DEPRECATED_SINCE(5, 15) - MatchRegExp Q_DECL_ENUMERATOR_DEPRECATED_X("MatchRegExp is deprecated. Use MatchRegularExpression instead") = 4, + MatchRegExp Q_DECL_ENUMERATOR_DEPRECATED_X("MatchRegExp is deprecated. Use MatchRegularExpression instead") = MatchRegularExpression, #endif MatchWildcard = 5, MatchFixedString = 8, - MatchRegularExpression = 9, MatchCaseSensitive = 16, MatchWrap = 32, MatchRecursive = 64 diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 3e22c9e661..cff2fab398 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2875,8 +2875,7 @@ \value MatchStartsWith The search term matches the start of the item. \value MatchEndsWith The search term matches the end of the item. \value MatchCaseSensitive The search is case sensitive. - \value MatchRegExp Performs string-based matching using a regular - expression as the search term. Uses the deprecated QRegExp class. + \value MatchRegExp Same as MatchRegularExpression \e{This enum value is deprecated since Qt 5.15.} \value MatchRegularExpression Performs string-based matching using a regular expression as the search term. Uses QRegularExpression. diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 41bdaa2ac5..57a6c2f239 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -2408,13 +2408,6 @@ QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role, QString t = v.toString(); switch (matchType) { -#if QT_DEPRECATED_SINCE(5, 15) - case Qt::MatchRegExp: - if (QRegExp(text, cs).exactMatch(t)) - result.append(idx); - break; -#endif - #if QT_CONFIG(regularexpression) case Qt::MatchRegularExpression: Q_FALLTHROUGH(); |