diff options
| author | Samuel Gaist <samuel.gaist@idiap.ch> | 2019-06-18 00:07:54 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2019-10-16 21:53:30 +0200 |
| commit | c222a9283d94ad1e29334bb2fba0beef7cc716c7 (patch) | |
| tree | 20a72a144a7006cc737cdb1e74a5663c41c5d5cd /src/corelib/global/qnamespace.h | |
| parent | 85ed676dff68b4d5cfa62112d758d80fb050594c (diff) | |
QAbstractItemModel: implement QRegularExpression support for match
This is part of the migration of qtbase from QRexExp to
QRegularExpression.
[ChangeLog][QtCore][QAbstractItemModel] The match() method now
supports the new Qt::RegularExpression match flag value. This
will allow users to use either a string or a fully configured
QRegularExpression when doing searches. In the second case,
the case sensitivity flag will be ignored if passed.
Task-number: QTBUG-72587
Change-Id: I07c8d72a661c48b7f4fcf13ef8e95980bcdcb998
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 810c55709c..047ed8e7b3 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1575,9 +1575,12 @@ public: MatchContains = 1, MatchStartsWith = 2, MatchEndsWith = 3, - MatchRegExp = 4, +#if QT_DEPRECATED_SINCE(5, 15) + MatchRegExp Q_DECL_ENUMERATOR_DEPRECATED_X("MatchRegExp is deprecated. Use MatchRegularExpression instead") = 4, +#endif MatchWildcard = 5, MatchFixedString = 8, + MatchRegularExpression = 9, MatchCaseSensitive = 16, MatchWrap = 32, MatchRecursive = 64 |