1 files changed, 6 insertions, 20 deletions
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 435fba5497..72c8519446 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -4,6 +4,7 @@
 #ifndef QFILEINFO_H
 #define QFILEINFO_H
 
+#include <QtCore/qcompare.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
@@ -21,6 +22,7 @@ class QFileInfoPrivate;
 class Q_CORE_EXPORT QFileInfo
 {
     friend class QDirIteratorPrivate;
+    friend class QDirListingPrivate;
 public:
     explicit QFileInfo(QFileInfoPrivate *d);
 
@@ -58,8 +60,10 @@ public:
     void swap(QFileInfo &other) noexcept
     { d_ptr.swap(other.d_ptr); }
 
+#if QT_CORE_REMOVED_SINCE(6, 8)
     bool operator==(const QFileInfo &fileinfo) const;
     inline bool operator!=(const QFileInfo &fileinfo) const { return !(operator==(fileinfo)); }
+#endif
 
     void setFile(const QString &file);
     void setFile(const QFileDevice &file);
@@ -151,7 +155,6 @@ public:
 
     qint64 size() const;
 
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
     QDateTime birthTime() const { return fileTime(QFile::FileBirthTime); }
     QDateTime metadataChangeTime() const { return fileTime(QFile::FileMetadataChangeTime); }
     QDateTime lastModified() const { return fileTime(QFile::FileModificationTime); }
@@ -163,25 +166,6 @@ public:
     QDateTime lastModified(const QTimeZone &tz) const { return fileTime(QFile::FileModificationTime, tz); }
     QDateTime lastRead(const QTimeZone &tz) const { return fileTime(QFile::FileAccessTime, tz); }
     QDateTime fileTime(QFile::FileTime time, const QTimeZone &tz) const;
-#else
-    QDateTime birthTime(const QTimeZone &tz = QTimeZone::LocalTime) const
-    {
-        return fileTime(QFile::FileBirthTime, tz);
-    }
-    QDateTime metadataChangeTime(const QTimeZone &tz = QTimeZone::LocalTime) const
-    {
-        return fileTime(QFile::FileMetadataChangeTime, tz);
-    }
-    QDateTime lastModified(const QTimeZone &tz = QTimeZone::LocalTime) const
-    {
-        return fileTime(QFile::FileModificationTime, tz);
-    }
-    QDateTime lastRead(const QTimeZone &tz = QTimeZone::LocalTime) const
-    {
-        return fileTime(QFile::FileAccessTime, tz);
-    }
-    QDateTime fileTime(QFile::FileTime time, const QTimeZone &tz = QTimeZone::LocalTime) const;
-#endif
 
     bool caching() const;
     void setCaching(bool on);
@@ -191,6 +175,8 @@ protected:
     QSharedDataPointer<QFileInfoPrivate> d_ptr;
 
 private:
+    friend Q_CORE_EXPORT bool comparesEqual(const QFileInfo &lhs, const QFileInfo &rhs);
+    Q_DECLARE_EQUALITY_COMPARABLE(QFileInfo)
     QFileInfoPrivate* d_func();
     inline const QFileInfoPrivate* d_func() const
     {