feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Make DS find the qmlpuppet on macOS

Browse Source 
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 <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Knud Dollereder
2022-11-09 15:21:30 +01:00
committed by Thomas Hartmann
parent 63022d08ea
commit 583e53cb08
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
View File

@@ -137,13 +137,6 @@ bool ExternalDependencies::hasStartupTarget() const
} }
namespace { namespace {
Utils::FilePath defaultPuppetFallbackDirectory()
{
if (Utils::HostOsInfo::isMacHost())
return Core::ICore::libexecPath("qmldesigner");
return Core::ICore::libexecPath();
}
Utils::FilePath qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory) Utils::FilePath qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory)
{ {
@@ -156,7 +149,7 @@ Utils::FilePath qmlPuppetFallbackDirectory(const DesignerSettings &settings)
auto puppetFallbackDirectory = Utils::FilePath::fromString( auto puppetFallbackDirectory = Utils::FilePath::fromString(
settings.value(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY).toString()); settings.value(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY).toString());
if (puppetFallbackDirectory.isEmpty() || !puppetFallbackDirectory.exists()) if (puppetFallbackDirectory.isEmpty() || !puppetFallbackDirectory.exists())
return defaultPuppetFallbackDirectory(); return Core::ICore::libexecPath();
return puppetFallbackDirectory; return puppetFallbackDirectory;
} }