From aa709cbbdb00a9968fbaacfbacdba89f5d1fa125 Mon Sep 17 00:00:00 2001 From: Sami Shalayel Date: Thu, 5 Dec 2024 11:30:45 +0100 Subject: [PATCH] qmlls: use hostbinpath instead of binpath Amends a737828d7d6b385ef09355e0c56b4ff9620b4f0a that used the binPath instead of the hostBinPath() when constructing the path to qmlls. This allows to run qmlls on a Boot2Qt project with the correct Qml import paths. Together with the above-mentioned commit, this fixes the undismissable warnings from QTBUG-114697 as QtC now starts the correct qmlls executable with the correct import paths on boot2qt projects. Fixes: QTBUG-114697 Change-Id: I1123d69a923f595869b980de1a0daf266cf2bc80 Reviewed-by: David Schulz --- src/plugins/qmljseditor/qmllsclientsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmljseditor/qmllsclientsettings.cpp b/src/plugins/qmljseditor/qmllsclientsettings.cpp index b0f90f648ee..3379111953d 100644 --- a/src/plugins/qmljseditor/qmllsclientsettings.cpp +++ b/src/plugins/qmljseditor/qmllsclientsettings.cpp @@ -121,7 +121,7 @@ static CommandLine commandLineForQmlls(const Project *project) auto [executable, version] = qmllsSettings()->m_useLatestQmlls ? evaluateLatestQmlls() - : std::make_pair(qtVersion->binPath() / "qmlls", qtVersion->qtVersion()); + : std::make_pair(qtVersion->hostBinPath() / "qmlls", qtVersion->qtVersion()); CommandLine result{executable, {}};