4 files changed, 29 insertions, 27 deletions
diff --git a/src/corelib/io/qfilesystementry.cpp b/src/corelib/io/qfilesystementry.cpp
index b507ad8ba0..6a655391be 100644
--- a/src/corelib/io/qfilesystementry.cpp
+++ b/src/corelib/io/qfilesystementry.cpp
@@ -303,6 +303,11 @@ bool QFileSystemEntry::isRoot() const
     return isRootPath(m_filePath);
 }
 
+bool QFileSystemEntry::isEmpty() const
+{
+    return m_filePath.isEmpty() && m_nativeFilePath.isEmpty();
+}
+
 // private methods
 
 void QFileSystemEntry::findLastSeparator() const
diff --git a/src/corelib/io/qfilesystementry_p.h b/src/corelib/io/qfilesystementry_p.h
index 049223fb91..8b5d506b0b 100644
--- a/src/corelib/io/qfilesystementry_p.h
+++ b/src/corelib/io/qfilesystementry_p.h
@@ -33,36 +33,34 @@ public:
     struct FromNativePath{};
     struct FromInternalPath{};
 
-    QFileSystemEntry();
-    explicit QFileSystemEntry(const QString &filePath);
-
-    QFileSystemEntry(const QString &filePath, FromInternalPath dummy);
-    QFileSystemEntry(const NativePath &nativeFilePath, FromNativePath dummy);
-    QFileSystemEntry(const QString &filePath, const NativePath &nativeFilePath);
-
-    QString filePath() const;
-    QString fileName() const;
-    QString path() const;
-    NativePath nativeFilePath() const;
-    QString baseName() const;
-    QString completeBaseName() const;
-    QString suffix() const;
-    QString completeSuffix() const;
-    bool isAbsolute() const;
-    bool isRelative() const;
-    bool isClean() const;
+    Q_AUTOTEST_EXPORT QFileSystemEntry();
+    Q_AUTOTEST_EXPORT explicit QFileSystemEntry(const QString &filePath);
+
+    Q_AUTOTEST_EXPORT QFileSystemEntry(const QString &filePath, FromInternalPath dummy);
+    Q_AUTOTEST_EXPORT QFileSystemEntry(const NativePath &nativeFilePath, FromNativePath dummy);
+    Q_AUTOTEST_EXPORT QFileSystemEntry(const QString &filePath, const NativePath &nativeFilePath);
+
+    Q_AUTOTEST_EXPORT QString filePath() const;
+    Q_AUTOTEST_EXPORT QString fileName() const;
+    Q_AUTOTEST_EXPORT QString path() const;
+    Q_AUTOTEST_EXPORT NativePath nativeFilePath() const;
+    Q_AUTOTEST_EXPORT QString baseName() const;
+    Q_AUTOTEST_EXPORT QString completeBaseName() const;
+    Q_AUTOTEST_EXPORT QString suffix() const;
+    Q_AUTOTEST_EXPORT QString completeSuffix() const;
+    Q_AUTOTEST_EXPORT bool isAbsolute() const;
+    Q_AUTOTEST_EXPORT bool isRelative() const;
+    Q_AUTOTEST_EXPORT bool isClean() const;
 
 #if defined(Q_OS_WIN)
-    bool isDriveRoot() const;
+    Q_AUTOTEST_EXPORT bool isDriveRoot() const;
     static bool isDriveRootPath(const QString &path);
     static QString removeUncOrLongPathPrefix(QString path);
 #endif
-    bool isRoot() const;
+    Q_AUTOTEST_EXPORT bool isRoot() const;
+
+    Q_AUTOTEST_EXPORT bool isEmpty() const;
 
-    bool isEmpty() const
-    {
-        return m_filePath.isEmpty() && m_nativeFilePath.isEmpty();
-    }
     void clear()
     {
         *this = QFileSystemEntry();
diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt
index 880225bb89..4100ce17d5 100644
--- a/tests/auto/corelib/io/CMakeLists.txt
+++ b/tests/auto/corelib/io/CMakeLists.txt
@@ -42,7 +42,7 @@ if(NOT ANDROID)
     add_subdirectory(qdir)
     add_subdirectory(qresourceengine)
 endif()
-if(QT_FEATURE_private_tests OR UNIX)
+if(QT_FEATURE_private_tests)
     add_subdirectory(qfilesystementry)
 endif()
 # QTBUG-88508
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
index 47c5a38d65..570f457224 100644
--- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -7,9 +7,8 @@
 
 qt_internal_add_test(tst_qfilesystementry
     SOURCES
-        ../../../../../src/corelib/io/qfilesystementry.cpp
-        ../../../../../src/corelib/io/qfilesystementry_p.h
         tst_qfilesystementry.cpp
     LIBRARIES
         Qt::CorePrivate
+        Qt::TestPrivate
 )