From 3c8dec2398ff92d8ad7dcb48f7c40925ecd5daba Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 10 Jul 2018 23:34:39 +0300 Subject: [PATCH] QmakePM: Show kit name in compiler mismatch message Change-Id: Ib5bfd90064c525a7b599434d31ab704e8e110d1a Reviewed-by: Tobias Hunger --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index ff7e11be97c..32063daad4f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1292,12 +1292,15 @@ void QmakeProject::testToolChain(ToolChain *tc, const Utils::FileName &path) con const Utils::FileName expected = tc->compilerCommand(); Environment env = Environment::systemEnvironment(); + Kit *k = nullptr; if (Target *t = activeTarget()) { + k = t->kit(); if (BuildConfiguration *bc = t->activeBuildConfiguration()) env = bc->environment(); else - t->kit()->addToEnvironment(env); + k->addToEnvironment(env); } + QTC_ASSERT(k, return); if (env.isSameExecutable(path.toString(), expected.toString())) return; @@ -1316,9 +1319,9 @@ void QmakeProject::testToolChain(ToolChain *tc, const Utils::FileName &path) con QCoreApplication::translate( "QmakeProjectManager", "\"%1\" is used by qmake, but \"%2\" is configured in the kit.\n" - "Please update your kit or choose a mkspec for qmake that matches " + "Please update your kit (%3) or choose a mkspec for qmake that matches " "your target environment better.") - .arg(path.toUserOutput()).arg(expected.toUserOutput()), + .arg(path.toUserOutput()).arg(expected.toUserOutput()).arg(k->displayName()), Utils::FileName(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); m_toolChainWarnings.insert(pair); }