From 26c903ce9bb2f53c18ee225c8aebb1a50f7fa025 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 29 Jul 2009 12:46:48 +0200
Subject: [PATCH] Fix for #Command not having a -spec argument.
---
src/plugins/qt4projectmanager/qt4project.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 957ef651163..c008d54913e 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1157,7 +1157,6 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
QString actualSpec = extractSpecFromArgumentList(qs->value(buildConfiguration, "qmakeArgs").toStringList());
if (actualSpec.isEmpty())
actualSpec = version->mkspec();
- QString parsedSpec = extractSpecFromArgumentList(result.second);
// Now to convert the actualSpec to a absolute path, we go through a few hops
if (QFileInfo(actualSpec).isRelative()) {
@@ -1176,6 +1175,11 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
}
}
+
+ QString parsedSpec = extractSpecFromArgumentList(result.second);
+ // if the MakeFile did not contain a mkspec, then it is the default for that qmake
+ if (parsedSpec.isEmpty())
+ parsedSpec = version->sourcePath() + "/mkspecs/" + version->mkspec();
if (QFileInfo(parsedSpec).isRelative())
parsedSpec = QDir::cleanPath(workingDirectory + "/" + parsedSpec);
--
GitLab