diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:38:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:38:13 +0100 |
| commit | 868160f215ea06d4dfbaf089fab03b066a9fef69 (patch) | |
| tree | ded676351febfccb60e25603486bd06d0d89185b /src/shared | |
| parent | 54c2dff181b0900644e973fca1ebb21c862f124f (diff) | |
| parent | ac382b68b7c67af45096cb590fc537b5794e8f27 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: Ia8fed69168d87afafdb5acf4de4d5d30f9b4ebf5
Diffstat (limited to 'src/shared')
| -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 96fb672519..01233fc46f 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)); } |