diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 7c536b6afa6..5549d870f4e 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1487,7 +1487,7 @@ void QtVersion::updateAbiAndMkspec() const mkspecFullPath = baseMkspecDir + "/macx-g++"; } //resolve mkspec link - mkspecFullPath = resolveLink(mkspecFullPath); + mkspecFullPath = QFileInfo(mkspecFullPath).canonicalFilePath(); } break; } @@ -1495,7 +1495,7 @@ void QtVersion::updateAbiAndMkspec() const f2.close(); } #else - mkspecFullPath =resolveLink(mkspecFullPath); + mkspecFullPath = QFileInfo(mkspecFullPath).canonicalFilePath(); #endif #ifdef Q_OS_WIN @@ -1650,17 +1650,6 @@ void QtVersion::updateAbiAndMkspec() const } } -QString QtVersion::resolveLink(const QString &path) const -{ - QFileInfo f(path); - int links = 16; - while (links-- && f.isSymLink()) - f.setFile(f.symLinkTarget()); - if (links <= 0) - return QString(); - return f.filePath(); -} - QString QtVersion::qtCorePath() const { QList dirs; diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 901b7cb9b67..5644a47d806 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -201,7 +201,6 @@ private: void updateVersionInfo() const; QString findQtBinary(const QStringList &possibleName) const; void updateAbiAndMkspec() const; - QString resolveLink(const QString &path) const; QString qtCorePath() const; QString m_displayName;