From f43c02d12f1ae70ef5af7eb0445c7f6b508c3277 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 16 Jul 2012 17:14:55 +0200 Subject: [PATCH] Use mkspec of the Qt version of qmake when matching profiles In case the qmake-line does not contain a mkspec argument, use the mkspec of the Qt version found by matching the qmake binary. This reduces the duplication of targets/profiles when opening new projects. Change-Id: I647e166ae0322fd093967abea760197cf4c7eedd Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint --- src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index c873f405363..960a3cdaa82 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -331,15 +331,13 @@ void TargetSetupPage::import(const Utils::FileName &path, const bool silent) Utils::FileName parsedSpec = Qt4BuildConfiguration::extractSpecFromArguments(&additionalArguments, path.toString(), version); Utils::FileName versionSpec = version->mkspec(); + if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromString(QLatin1String("default"))) + parsedSpec = versionSpec; QString specArgument; // Compare mkspecs and add to additional arguments - if (parsedSpec.isEmpty() || parsedSpec == versionSpec - || parsedSpec == Utils::FileName::fromString(QLatin1String("default"))) { - // using the default spec, don't modify additional arguments - } else { + if (parsedSpec != versionSpec) specArgument = QLatin1String("-spec ") + Utils::QtcProcess::quoteArg(parsedSpec.toUserOutput()); - } Utils::QtcProcess::addArgs(&specArgument, additionalArguments); // Find profile: