Commit 2f1993e4 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

don't re-implement QDir::canonicalFilePath() by hand

parent 2e739d8e
......@@ -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<QDir> dirs;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment