diff options
| author | Shyamnath Premnadh <shyamnath.premnadh@qt.io> | 2023-04-03 15:23:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-03 17:33:11 +0000 |
| commit | da473c52f456e89e66f0a0a2bc3bc1efe4fb29c1 (patch) | |
| tree | bad26f4ab6bb0a69cf522ddf723d17530784963e /build_scripts/utils.py | |
| parent | 3b011723c201177b5344e093ceb8ac9edbe9c1ab (diff) | |
PySideTools: Fix non-existing macOS toolsv6.5.0
- designer, assistant and linguist were not existing due to a
regression from 43109854a2966afe2e0cf29961157a6f54d5775c
Change-Id: I7f92ab2eca2fd98eb049e8e81a9efa56ebec3459
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit a48de6afbf127831aa46c1c006d777861bbbe9cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'build_scripts/utils.py')
| -rw-r--r-- | build_scripts/utils.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 633e413d0..53cb5961e 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -18,8 +18,8 @@ from pathlib import Path from textwrap import dedent, indent from .log import log -from . import (PYSIDE_PYTHON_TOOLS, PYSIDE_LINUX_BIN_TOOLS, PYSIDE_LINUX_LIBEXEC_TOOLS, - PYSIDE_WINDOWS_BIN_TOOLS) +from . import (PYSIDE_PYTHON_TOOLS, PYSIDE_LINUX_BIN_TOOLS, PYSIDE_UNIX_LIBEXEC_TOOLS, + PYSIDE_WINDOWS_BIN_TOOLS, PYSIDE_UNIX_BIN_TOOLS, PYSIDE_UNIX_BUNDLED_TOOLS) try: # Using the distutils implementation within setuptools @@ -1144,10 +1144,16 @@ def available_pyside_tools(qt_tools_path: Path, package_for_wheels: bool = False else: lib_exec_path = qt_tools_path / "Qt" / "libexec" if package_for_wheels \ else qt_tools_path / "libexec" - pyside_tools.extend([tool for tool in PYSIDE_LINUX_LIBEXEC_TOOLS + pyside_tools.extend([tool for tool in PYSIDE_UNIX_LIBEXEC_TOOLS if tool_exist(lib_exec_path / tool)]) - pyside_tools.extend([tool for tool in PYSIDE_LINUX_BIN_TOOLS - if tool_exist(bin_path / tool)]) + if sys.platform == 'darwin': + pyside_tools.extend([tool for tool in PYSIDE_UNIX_BIN_TOOLS + if tool_exist(bin_path / tool)]) + pyside_tools.extend([tool_name for tool_name, tool_path in PYSIDE_UNIX_BUNDLED_TOOLS.items() + if tool_exist(bin_path / tool_path)]) + else: + pyside_tools.extend([tool for tool in PYSIDE_LINUX_BIN_TOOLS + if tool_exist(bin_path / tool)]) return pyside_tools |