From cee8ea7c13b9e91f4b024ebe19c32416b9719fea Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Fri, 13 Jun 2025 16:39:55 +0300 Subject: [PATCH] QDirListing: properly deprecate ExcludeSpecial Add "since 6.10" to ExcludeOther's docs. Found in API review. Amends c553f39e3d3cd02854850da0dfc639acbae59299. Pick-to: 6.10 Change-Id: I3edb32d4d50864ddbdde03aaca750d590a0e0854 Reviewed-by: Thiago Macieira --- src/corelib/io/qdirlisting.cpp | 2 +- src/corelib/io/qdirlisting.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qdirlisting.cpp b/src/corelib/io/qdirlisting.cpp index b4d425a02b0..c626033dcdb 100644 --- a/src/corelib/io/qdirlisting.cpp +++ b/src/corelib/io/qdirlisting.cpp @@ -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 diff --git a/src/corelib/io/qdirlisting.h b/src/corelib/io/qdirlisting.h index 3374ae6994a..07e307e707f 100644 --- a/src/corelib/io/qdirlisting.h +++ b/src/corelib/io/qdirlisting.h @@ -5,6 +5,7 @@ #ifndef QDIRLISTING_H #define QDIRLISTING_H +#include #include #include #include @@ -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,