Commit 7215c033 authored by dt's avatar dt
Browse files

Check for existince of the QMAKESPEC_ORIGINAL directory

Some mkspecs do have a QMAKESPEC_ORIGINAL and yet that directory doesn't
exist. In that case ignore it.

Task-Nr: QTCREATORBUG-586
parent 7f3f30c0
......@@ -1161,9 +1161,11 @@ void QtVersion::updateToolChainAndMkspec() const
if (line.startsWith("QMAKESPEC_ORIGINAL")) {
const QList<QByteArray> &temp = line.split('=');
if (temp.size() == 2) {
mkspecFullPath = temp.at(1).trimmed();
QString possibleFullPath = temp.at(1).trimmed();
// We sometimes get a mix of different slash styles here...
mkspecFullPath = mkspecFullPath.replace('\\', '/');
possibleFullPath = possibleFullPath.replace('\\', '/');
if (QFileInfo(possibleFullPath).exists()) // Only if the path exists
mkspecFullPath = possibleFullPath
}
break;
}
......
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