diff options
| author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-07-25 09:23:28 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-08-19 11:38:26 +0000 |
| commit | bcd80eebf983a2b547662d7e0d67bc8624d1130f (patch) | |
| tree | 248e569a21dc62ec8f2016c5efdde6d6afcf1e02 /src/corelib/io | |
| parent | 6228c0528ca5cea2f8c309c4f64e38eb729b04da (diff) | |
Implement exact match expression builder for QRegularExpression
QRegularExpression doesn't offer a direct equivalent of QRegExp's exact
match.
There are several places in the Qt sources that use this feature. This
patch implements a small helper function that builds the expression as
recommended in the documentation and updates the related code.
[ChangeLog][Core][Tools] QRegularExpression now provides
anchoredPattern() which is a helper function to build regular
expressions used for exact matching.
Change-Id: Idbbf142c4c5cb9b62abf8229f4ce85fd4409e5d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 85ea2cb139..39422c3401 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2129,7 +2129,7 @@ bool QDir::match(const QStringList &filters, const QString &fileName) QString wildcard = QRegularExpression::wildcardToRegularExpression(*sit); // Insensitive exact match // (see Notes for QRegExp Users in QRegularExpression's documentation) - QRegularExpression rx(QLatin1String("\\A(?:") + wildcard + QLatin1String(")\\z"), + QRegularExpression rx(QRegularExpression::anchoredPattern(wildcard), QRegularExpression::CaseInsensitiveOption); if (rx.match(fileName).hasMatch()) return true; |