diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-03-18 16:25:01 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-03-30 11:33:02 +0100 |
commit | 2e0070d42c0bff5074eb9494ba0e561b91f0622b (patch) | |
tree | b7603a7908f4f639d7f195a0eb36ef483e8052a9 | |
parent | 3151c510e8696757c97bf0970531271af2eab50e (diff) |
Remove QRegExp dependencies and mentions
Change-Id: I399f8980f56eda5d60b554aa942bf045ab91e0d6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/corelib/io/qdir.cpp | 1 | ||||
-rw-r--r-- | src/corelib/io/qdiriterator.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 20af40f973..fa559a22bb 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 1cf6b1be08..bd4f1fd583 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 <QtCore/qregexp.h> +#endif #include <QtCore/qset.h> #include <QtCore/qstack.h> #include <QtCore/qvariant.h> |