diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-07 14:51:25 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-07 14:51:25 +0200 |
| commit | 4f5b2733b6e8be08177de628da55b8b22db9f707 (patch) | |
| tree | ae5c1f1ca36b070211920e8878c9c80e0b6fbda4 /src/corelib/io/qdiriterator.cpp | |
| parent | ac68ef1efc27669e9c8fc255298345d72d198d68 (diff) | |
| parent | 050e7bafad3b723fe5be6e981a32e708dbdc5150 (diff) | |
Merge 5.13 into 5.13.0
Change-Id: I98e2b93d78dba1cbf746c39a0b5877d5e72c91fc
Diffstat (limited to 'src/corelib/io/qdiriterator.cpp')
| -rw-r--r-- | src/corelib/io/qdiriterator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 648593b020..ccde9745bf 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -320,7 +320,8 @@ void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo) bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInfo &fi) const { - Q_ASSERT(!fileName.isEmpty()); + if (fileName.isEmpty()) + return false; // filter . and ..? const int fileNameSize = fileName.size(); |