Skip to content

Commit ae08901

Browse files
hillwoodroc18202781743
authored andcommitted
fix: Fix build with Qt 6.9
Qt 6.9 removed QAbstractFileEngine::beginEntryList/endEntryList. The ddcifileengine.cpp still provided an implementation of beginEntryList() which is no longer part of the base class, causing build failures with Qt 6.9. Log: remove QAbstractFileEngine::beginEntryList for Qt 6.9+
1 parent 1bb2346 commit ae08901

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/dci/private/ddcifileengine.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ QDateTime DDciFileEngine::fileTime(QAbstractFileEngine::FileTime time) const
586586
return QFileInfo(dciFilePath).fileTime(static_cast<QFile::FileTime>(time));
587587
}
588588
#endif
589+
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
589590
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
590591
QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames)
591592
#else
@@ -598,6 +599,7 @@ DDciFileEngine::Iterator *DDciFileEngine::beginEntryList(QDir::Filters filters,
598599
return new DDciFileEngineIterator(filters, filterNames);
599600
#endif
600601
}
602+
#endif
601603

602604
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
603605
QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)

src/dci/private/ddcifileengine_p.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ class DDciFileEngine : public QAbstractFileEngine
118118
#endif
119119

120120
typedef DDciFileEngineIterator Iterator;
121-
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
121+
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
122+
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
123+
IteratorUniquePtr endEntryList() override;
124+
#elif QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
122125
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
123126
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
124127
IteratorUniquePtr endEntryList() override;

0 commit comments

Comments
 (0)