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

QmakeProjectImporter: Slightly tweak spec handling

Browse Source 
The removed code had actually no effect since it changed a variable that
was not used later. Since we are looking for a kit that has a identical
spec, there's no need to pass any spec in additional arguments.

Also on creating a temporary kit, don't set mkspec if it's the same
as the qt versions mkspec.

Change-Id: Ia37317a5b6fefa603106c8761279577271f32a7e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-07-24 16:30:13 +02:00
parent ef45750294
commit eba7d8d196
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -173,14 +173,6 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
qCDebug(logs) << " No parsed spec or default spec => parsed spec now:" << parsedSpec;
}
QString specArgument;
// Compare mkspecs and add to additional arguments
if (parsedSpec != versionSpec) {
specArgument = QLatin1String("-spec ") + QtcProcess::quoteArg(parsedSpec.toUserOutput());
QtcProcess::addArgs(&specArgument, additionalArguments);
qCDebug(logs) << " custom spec added to additionalArguments:" << additionalArguments;
}
qCDebug(logs) << "*******************";
qCDebug(logs) << "* Looking for kits";
// Find kits (can be more than one, e.g. (Linux-)Desktop and embedded linux):
@@ -372,7 +364,8 @@ Kit *QmakeProjectImporter::createTemporaryKit(BaseQtVersion *version,
QtKitInformation::setQtVersion(k, version);
ToolChainKitInformation::setToolChain(k, preferredToolChain(version, parsedSpec, archConfig));
QmakeKitInformation::setMkspec(k, parsedSpec);
if (parsedSpec != version->mkspec())
QmakeKitInformation::setMkspec(k, parsedSpec);
markTemporary(k);
if (temporaryVersion)