From 583e53cb085db1dec0dbd648b4511d00f262277d Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Wed, 9 Nov 2022 15:21:30 +0100 Subject: [PATCH] QmlDesigner: Make DS find the qmlpuppet on macOS The puppet is now build into a different directory. This patch updates the qml2puppet search path for DS. Change-Id: Ib522df599f429914275700813fa8d1e526b1ce4a Reviewed-by: Marco Bubke Reviewed-by: Qt CI Bot --- .../qmldesigner/qmldesignerexternaldependencies.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp index 9538f61297d..eb37c71b500 100644 --- a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp +++ b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp @@ -137,13 +137,6 @@ bool ExternalDependencies::hasStartupTarget() const } namespace { -Utils::FilePath defaultPuppetFallbackDirectory() -{ - if (Utils::HostOsInfo::isMacHost()) - return Core::ICore::libexecPath("qmldesigner"); - - return Core::ICore::libexecPath(); -} Utils::FilePath qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory) { @@ -156,7 +149,7 @@ Utils::FilePath qmlPuppetFallbackDirectory(const DesignerSettings &settings) auto puppetFallbackDirectory = Utils::FilePath::fromString( settings.value(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY).toString()); if (puppetFallbackDirectory.isEmpty() || !puppetFallbackDirectory.exists()) - return defaultPuppetFallbackDirectory(); + return Core::ICore::libexecPath(); return puppetFallbackDirectory; }