From bf73772d2c43a71d13a55e9914c631591cd01815 Mon Sep 17 00:00:00 2001 From: Shyamnath Premnadh Date: Mon, 21 Nov 2022 16:37:34 +0100 Subject: PySide Build: find qtpaths before SetupRunner.run_setup() - 'qtpaths' needs to be known while setting up the corresponding setup.py command to ignore the pyside qt wrapper tools whose qt tool does not exist - This is an extension to 43109854a2966afe2e0cf29961157a6f54d5775c. The aforementioned patch led to qtpaths being found 2 times, once inside CommandMixin class and also much before that inside SetupRunner.run_setup(). This redundancy is now removed by moving the finding of OPTION['QTPATHS'] outside the mixin and before CommandMixin object of the command being run is initialized - the help commands, build_rst_docs and cross compilation command should not complain about qtpaths anymore - fixed cross compilation build Task-number: PYSIDE-2195 Change-Id: I862baf954dea0a3bdaf5ddf411f119178b457c42 Reviewed-by: Friedemann Kleint Reviewed-by: Qt CI Bot --- build_scripts/utils.py | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'build_scripts/utils.py') diff --git a/build_scripts/utils.py b/build_scripts/utils.py index efb53ff25..54677a65f 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1152,20 +1152,6 @@ def available_pyside_tools(qt_tools_path: Path, package_for_wheels: bool = False return pyside_tools -def find_qt_install_path() -> Path: - """ - Find Qt installation path - """ - - def where_is(x): - return Path(which(x)) - - qtpaths = where_is("qtpaths") if where_is("qtpaths") else where_is("qtpaths6") - if not qtpaths: - raise RuntimeError("qtpaths not found") - else: - return qtpaths.parents[1] - def copy_qt_metatypes(destination_qt_dir, _vars): """Copy the Qt metatypes files which changed location in 6.5""" # /[lib]?/metatypes/* -> /{st_package_name}/Qt/[lib]?/metatypes -- cgit v1.2.3