Skip to content

Commit b77df20

Browse files
committed
fix(filesystem): add version guard for entryList method
Conditionally compile entryList override only for Qt < 6.11.0 to prevent compilation errors with newer Qt versions. Signed-off-by: ComixHe <heyuming@deepin.org>
1 parent 3e34c88 commit b77df20

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/filesystem/dcapfsfileengine.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,16 @@ bool DCapFSFileEngine::setSize(qint64 size)
221221
return QFSFileEngine::setSize(size);
222222
}
223223

224+
#if QT_VERSION < QT_VERSION_CHECK(6, 11, 0)
224225
QStringList DCapFSFileEngine::entryList(QDir::Filters filters, const QStringList &filterNames) const
225226
{
226227
D_DC(DCapFSFileEngine);
227228
if (!d->canReadWrite(d->file))
228229
return {};
229230
return QFSFileEngine::entryList(filters, filterNames);
230231
}
232+
#endif
233+
231234
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)
232235
QAbstractFileEngine::IteratorUniquePtr DCapFSFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)
233236
#elif QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)

src/filesystem/private/dcapfsfileengine_p.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ class DCapFSFileEngine : public QFSFileEngine, public DObject
5656
#endif
5757

5858
bool setSize(qint64 size) override;
59+
#if QT_VERSION < QT_VERSION_CHECK(6, 11, 0)
5960
QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
61+
#endif
62+
6063
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)
6164
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
6265
#elif QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)

0 commit comments

Comments
 (0)