4 files changed, 32 insertions, 6 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index d3f846bc1d..ef97d67653 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -454,7 +454,13 @@ QFile::exists(const QString &fileName)
 
     \sa fileName(), setFileName()
 */
+QString QFile::symLinkTarget() const
+{
+    Q_D(const QFile);
+    return d->engine()->fileName(QAbstractFileEngine::LinkName);
+}
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -463,9 +469,9 @@ QFile::exists(const QString &fileName)
 QString
 QFile::readLink() const
 {
-    Q_D(const QFile);
-    return d->engine()->fileName(QAbstractFileEngine::LinkName);
+    return symLinkTarget();
 }
+#endif
 
 /*!
     \fn static QString QFile::symLinkTarget(const QString &fileName)
@@ -478,7 +484,12 @@ QFile::readLink() const
     This name may not represent an existing file; it is only a string.
     QFile::exists() returns \c true if the symlink points to an existing file.
 */
+QString QFile::symLinkTarget(const QString &fileName)
+{
+    return QFileInfo(fileName).symLinkTarget();
+}
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -487,8 +498,9 @@ QFile::readLink() const
 QString
 QFile::readLink(const QString &fileName)
 {
-    return QFileInfo(fileName).readLink();
+    return symLinkTarget(fileName);
 }
+#endif
 
 /*!
     Removes the file specified by fileName(). Returns \c true if successful;
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h
index e6f3d942fe..cf1465ec70 100644
--- a/src/corelib/io/qfile.h
+++ b/src/corelib/io/qfile.h
@@ -107,10 +107,14 @@ public:
     bool exists() const;
     static bool exists(const QString &fileName);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QFile::symLinkTarget() instead")
     QString readLink() const;
+    QT_DEPRECATED_X("Use QFile::symLinkTarget(QString) instead")
     static QString readLink(const QString &fileName);
-    inline QString symLinkTarget() const { return readLink(); }
-    inline static QString symLinkTarget(const QString &fileName) { return readLink(fileName); }
+#endif
+    QString symLinkTarget() const;
+    static QString symLinkTarget(const QString &fileName);
 
     bool remove();
     static bool remove(const QString &fileName);
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 185e061d8f..998382021d 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -1107,6 +1107,7 @@ bool QFileInfo::isRoot() const
     \sa exists(), isSymLink(), isDir(), isFile()
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -1114,6 +1115,12 @@ bool QFileInfo::isRoot() const
 */
 QString QFileInfo::readLink() const
 {
+    return symLinkTarget();
+}
+#endif
+
+QString QFileInfo::symLinkTarget() const
+{
     Q_D(const QFileInfo);
     if (d->isDefaultConstructed)
         return QLatin1String("");
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index f295a86015..baea18fab1 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -116,8 +116,11 @@ public:
     bool isRoot() const;
     bool isBundle() const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QFileInfo::symLinkTarget() instead")
     QString readLink() const;
-    inline QString symLinkTarget() const { return readLink(); }
+#endif
+    QString symLinkTarget() const;
 
     QString owner() const;
     uint ownerId() const;