From 7215c033698d68bd51538890e9087e3e5b7e2910 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 15 Mar 2010 16:07:54 +0100
Subject: [PATCH] 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
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 053982c099c..72d63d6afbc 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -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;
}
--
GitLab