diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-25 10:43:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-25 12:18:20 +0000 |
| commit | 05cc1a77e58405427f85504ac9aaf8dca771ba3e (patch) | |
| tree | 67a768959fe207d60630032b1d4ab36dc34ba655 | |
| parent | e5a5d38c200a33606e7f3d44603f62219f0bf63e (diff) | |
| download | qt-creator-05cc1a77e58405427f85504ac9aaf8dca771ba3e.tar.gz | |
QFile/QFileInfo: readLink() was replaced by symLinkTarget()
(partially cherry picked from qtbase/7c69f6171ddc76d22e4f6e433be69c5cf365db8f)
Change-Id: I8910c8d5255f6ea12589c04eeedcec3d8fd3f277
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 3ed649163d..f0b9b52e29 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1185,7 +1185,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)); } |