summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-27 14:22:15 +0200
committerhjk <hjk@qt.io>2019-05-28 11:12:00 +0000
commitcc877949cacf036f7c279087b3e3f47286be3566 (patch)
treecd9787e441987d0361b3176acbae4476e270254d /src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
parent774d2063d0d26c7586caf7bf543edb84071c50d1 (diff)
downloadqt-creator-cc877949cacf036f7c279087b3e3f47286be3566.tar.gz
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 <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakekitinformation.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakekitinformation.cpp4
1 files changed, 2 insertions, 2 deletions
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<ToolChain *> possibleTcs = ToolChainManager::toolChains(
[version](const ToolChain *t) {
return t->isValid()
@@ -133,7 +133,7 @@ void QmakeKitAspect::setup(Kit *k)
if (!possibleTcs.isEmpty()) {
const QList<ToolChain *> 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