From fb03ec4af4b403bbba7cf564eb6a625c24675b62 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 1 Mar 2021 14:32:39 +0100 Subject: Fix build after moving uic/rcc to libexec Grab uic/rcc from libexec for installation. Task-number: QTBUG-88791 Task-number: PYSIDE-1518 Change-Id: I6d3c1298725c942e7705b747f49a152ce7ccdbec Reviewed-by: Cristian Maureira-Fredes --- build_scripts/platforms/unix.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build_scripts/platforms/unix.py') diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 21747ad62..6e2785be0 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -45,6 +45,7 @@ from .macos import prepare_standalone_package_macos from ..config import config from ..options import OPTION +from ..qtinfo import QtInfo from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources from ..versions import PYSIDE, SHIBOKEN @@ -203,7 +204,8 @@ def prepare_packages_posix(self, vars): # Re-generate examples Qt resource files for Python 3 # compatibility examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) - pyside_rcc_path = "rcc" + lib_execs_dir = QtInfo().lib_execs_dir + pyside_rcc_path = f"{lib_execs_dir}/rcc" pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) -- cgit v1.2.3