From bf7bc78762c6425483b4bdaf6c10bd7cd73f024e Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Jun 2021 08:59:06 +0200 Subject: [PATCH] ProjectExplorer: Use local paths for Compiler and Qmake executable ... for variable expansion. They are used in the context of buildsteps, running locally on the build device. It's also pre-docker behavior were all paths were local anyway. Change-Id: I5d7cdc744678b0e7d09363fa1a3f3adc0cef4e02 Reviewed-by: David Schulz --- src/plugins/projectexplorer/kitinformation.cpp | 5 +++-- src/plugins/qtsupport/qtkitinformation.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 6052323fec4..f6f651b8688 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -547,9 +547,10 @@ void ToolChainKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expa expander->registerVariable("Compiler:Executable", tr("Path to the compiler executable"), [kit] { const ToolChain *tc = cxxToolChain(kit); - return tc ? tc->compilerCommand().toString() : QString(); + return tc ? tc->compilerCommand().path() : QString(); }); + // After 4.2 expander->registerPrefix("Compiler:Name", tr("Compiler for different languages"), [kit](const QString &ls) { const ToolChain *tc = toolChain(kit, findLanguage(ls)); @@ -558,7 +559,7 @@ void ToolChainKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expa expander->registerPrefix("Compiler:Executable", tr("Compiler executable for different languages"), [kit](const QString &ls) { const ToolChain *tc = toolChain(kit, findLanguage(ls)); - return tc ? tc->compilerCommand().toString() : QString(); + return tc ? tc->compilerCommand().path() : QString(); }); } diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index d88f4df59b0..9cd3b949468 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -320,7 +320,7 @@ void QtKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const expander->registerVariable("Qt:qmakeExecutable", tr("Path to the qmake executable"), [kit]() -> QString { BaseQtVersion *version = qtVersion(kit); - return version ? version->qmakeCommand().toString() : QString(); + return version ? version->qmakeCommand().path() : QString(); }); }