8 files changed, 37 insertions, 11 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index 432339d48e..ade8e15a39 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -1190,7 +1190,7 @@ bool QMakeEvaluator::loadSpecInternal()
 #  ifdef Q_OS_UNIX
     if (m_qmakespec.endsWith(QLatin1String("/default-host"))
         || m_qmakespec.endsWith(QLatin1String("/default"))) {
-        QString rspec = QFileInfo(m_qmakespec).readLink();
+        QString rspec = QFileInfo(m_qmakespec).symLinkTarget();
         if (!rspec.isEmpty())
             m_qmakespec = QDir::cleanPath(QDir(m_qmakespec).absoluteFilePath(rspec));
     }
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;
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 3e29475636..714c96b5e5 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -2022,7 +2022,7 @@ static void stateCheck(const QFileInfo &info, const QString &dirname, const QStr
     QVERIFY(!info.isRoot());
     QCOMPARE(info.isNativePath(), !filename.isEmpty());
 
-    QCOMPARE(info.readLink(), QString());
+    QCOMPARE(info.symLinkTarget(), QString());
     QCOMPARE(info.ownerId(), uint(-2));
     QCOMPARE(info.groupId(), uint(-2));
     QCOMPARE(info.owner(), QString());
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
index dbc3d68e93..cf4ab4902d 100644
--- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -376,7 +376,7 @@ void tst_QTemporaryFile::io()
     before.setSecsSinceEpoch(before.toSecsSinceEpoch());
 
     QVERIFY(file.open());
-    QVERIFY(file.readLink().isEmpty()); // it's not a link!
+    QVERIFY(file.symLinkTarget().isEmpty()); // it's not a link!
     QFile::Permissions perm = file.permissions();
     QVERIFY(perm & QFile::ReadOwner);
     QVERIFY(file.setPermissions(perm));
diff --git a/tests/benchmarks/corelib/io/qfileinfo/main.cpp b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
index 104c01d118..6cc96777a1 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/main.cpp
+++ b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
@@ -81,7 +81,7 @@ void qfileinfo::symLinkTargetPerformanceLNK()
     QString linkTarget;
     QBENCHMARK {
         for(int i=0; i<100; i++)
-            linkTarget = info.readLink();
+            linkTarget = info.symLinkTarget();
     }
     QVERIFY(QFile::remove("link.lnk"));
 }
@@ -104,7 +104,7 @@ void qfileinfo::symLinkTargetPerformanceMounpoint()
     QString linkTarget;
     QBENCHMARK {
         for(int i=0; i<100; i++)
-            linkTarget = info.readLink();
+            linkTarget = info.symLinkTarget();
     }
     QVERIFY(QDir().rmdir(mountpoint));
 }