Commit 766b9a92 authored by Tobias Hunger's avatar Tobias Hunger

Use default mkspec when supported by the tool chain

Change-Id: Icd47ae8cd7871389d9080091c429baa65d868e42
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 98b230c9
......@@ -793,16 +793,19 @@ Utils::FileName BaseQtVersion::mkspec() const
Utils::FileName BaseQtVersion::mkspecFor(ProjectExplorer::ToolChain *tc) const
{
Utils::FileName versionSpec = mkspec();
if (!tc)
return mkspec();
return versionSpec;
const QList<Utils::FileName> tcSpecList = tc->suggestedMkspecList();
if (tcSpecList.contains(versionSpec))
return versionSpec;
foreach (const Utils::FileName &tcSpec, tcSpecList) {
if (hasMkspec(tcSpec))
return tcSpec;
}
return mkspec();
return versionSpec;
}
Utils::FileName BaseQtVersion::mkspecPath() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment