feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix for #Command not having a -spec argument.

Browse Source
This commit is contained in:
dt
2009-07-29 12:46:48 +02:00
parent 027a19841d
commit 26c903ce9b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -1157,7 +1157,6 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
QString actualSpec = extractSpecFromArgumentList(qs->value(buildConfiguration, "qmakeArgs").toStringList()); QString actualSpec = extractSpecFromArgumentList(qs->value(buildConfiguration, "qmakeArgs").toStringList());
if (actualSpec.isEmpty()) if (actualSpec.isEmpty())
actualSpec = version->mkspec(); actualSpec = version->mkspec();
QString parsedSpec = extractSpecFromArgumentList(result.second);
// Now to convert the actualSpec to a absolute path, we go through a few hops // Now to convert the actualSpec to a absolute path, we go through a few hops
if (QFileInfo(actualSpec).isRelative()) { 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()) if (QFileInfo(parsedSpec).isRelative())
parsedSpec = QDir::cleanPath(workingDirectory + "/" + parsedSpec); parsedSpec = QDir::cleanPath(workingDirectory + "/" + parsedSpec);