From 2e0070d42c0bff5074eb9494ba0e561b91f0622b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 18 Mar 2020 16:25:01 +0100 Subject: [PATCH] Remove QRegExp dependencies and mentions Change-Id: I399f8980f56eda5d60b554aa942bf045ab91e0d6 Reviewed-by: Simon Hausmann --- src/corelib/io/qdir.cpp | 1 - src/corelib/io/qdiriterator.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 20af40f9736..fa559a22bbb 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2150,7 +2150,6 @@ bool QDir::match(const QStringList &filters, const QString &fileName) { for (QStringList::ConstIterator sit = filters.constBegin(); sit != filters.constEnd(); ++sit) { // Insensitive exact match - // (see Notes for QRegExp Users in QRegularExpression's documentation) QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(*sit), QRegularExpression::CaseInsensitiveOption); if (rx.match(fileName).hasMatch()) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 1cf6b1be08c..bd4f1fd5839 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -93,7 +93,9 @@ #include "qdir_p.h" #include "qabstractfileengine_p.h" +#ifdef QT_BOOTSTRAPPED #include +#endif #include #include #include