1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDirListing: properly deprecate ExcludeSpecial

Browse Source 
Add "since 6.10" to ExcludeOther's docs.

Found in API review.

Amends c553f39e3d3cd02854850da0dfc639acbae59299.

Change-Id: I3edb32d4d50864ddbdde03aaca750d590a0e0854
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit cee8ea7c13b9e91f4b024ebe19c32416b9719fea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2025-06-13 16:39:55 +03:00 committed by Qt Cherry-pick Bot
parent 9eb84657bc
commit d50bb03157
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qdirlisting.cpp
View File

@ -76,7 +76,7 @@
links to directories will be excluded too.
\omitvalue ExcludeSpecial
\value ExcludeOther
\value ExcludeOther [since 6.10]
Don't list file system entries that are \e not directories, regular files,
or symbolic links.
\list

5
src/corelib/io/qdirlisting.h
View File

@ -5,6 +5,7 @@
#ifndef QDIRLISTING_H
#define QDIRLISTING_H
#include <QtCore/qtdeprecationmarkers.h>
#include <QtCore/qfiledevice.h>
#include <QtCore/qflags.h>
#include <QtCore/qtclasshelpermacros.h>
@ -28,7 +29,9 @@ public:
Default = 0x000000,
ExcludeFiles = 0x000004,
ExcludeDirs = 0x000008,
QT6_ONLY(ExcludeSpecial = 0x000010,)
#if QT_DEPRECATED_SINCE(6, 14)
ExcludeSpecial QT_DEPRECATED_VERSION_X_6_14("Use ExcludeOther instead.") = 0x000010,
#endif
ExcludeOther = 0x000010,
ResolveSymlinks = 0x000020,
FilesOnly = ExcludeDirs | ExcludeOther,