From adf829e65d0837c043dbfdfaba49dd145debe954 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 15 Apr 2020 10:52:51 +0200 Subject: Add a QRegularExpression::fromWildcard() convenience method Simplify constructing QRegularExpression objects from a glob pattern. Change-Id: I06f60b1dfea3da969e2474dedd44b6ca5d456d7d Reviewed-by: Simon Hausmann Reviewed-by: Joerg Bornemann --- src/corelib/io/qdiriterator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qdiriterator.cpp') diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index d77829e9f3..0c60ca8920 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -170,9 +170,9 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QFileSystemEntry &entry, const QS #if QT_CONFIG(regularexpression) nameRegExps.reserve(nameFilters.size()); for (const auto &filter : nameFilters) { - QString re = QRegularExpression::wildcardToRegularExpression(filter); - nameRegExps.append( - QRegularExpression(re, (filters & QDir::CaseSensitive) ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption)); + auto re = QRegularExpression::fromWildcard(filter, (filters & QDir::CaseSensitive ? + Qt::CaseSensitive : Qt::CaseInsensitive)); + nameRegExps.append(re); } #endif QFileSystemMetaData metaData; -- cgit v1.2.3