From cc877949cacf036f7c279087b3e3f47286be3566 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 27 May 2019 14:22:15 +0200 Subject: ProjectExplorer: (Re-)start using strings for mkspecs Even if this is part of a directory name it is naturally closer to a "string" id than a file path. Change-Id: If66f930526744379ce86e2b18bd9eac7fabfe773 Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp') diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index c3ebac1dcf..38e8418889 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -123,7 +123,7 @@ void QmakeKitAspect::setup(Kit *k) ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec))) { + if (!tc || (!tc->suggestedMkspecList().empty() && !tc->suggestedMkspecList().contains(spec.toString()))) { const QList possibleTcs = ToolChainManager::toolChains( [version](const ToolChain *t) { return t->isValid() @@ -133,7 +133,7 @@ void QmakeKitAspect::setup(Kit *k) if (!possibleTcs.isEmpty()) { const QList goodTcs = Utils::filtered(possibleTcs, [&spec](const ToolChain *t) { - return t->suggestedMkspecList().contains(spec); + return t->suggestedMkspecList().contains(spec.toString()); }); // Hack to prefer a tool chain from PATH (e.g. autodetected) over other matches. // This improves the situation a bit if a cross-compilation tool chain has the -- cgit v1.2.1