From eba7d8d19619086410b186443f29d53b74c6c783 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 24 Jul 2015 16:30:13 +0200 Subject: [PATCH] QmakeProjectImporter: Slightly tweak spec handling 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 --- .../qmakeprojectmanager/qmakeprojectimporter.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index b529ea68698..f7b73af7ceb 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -173,14 +173,6 @@ QList 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)