diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-22 18:29:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-29 15:42:46 +0000 |
| commit | 389538e2ecb4b07c28ce274087baacdac51996d8 (patch) | |
| tree | 865fa37bc9bdb94bd5322d847da8ef4d82474afc /build_scripts/main.py | |
| parent | e47762e7ad848bb45676913d75f44f7485494479 (diff) | |
setup.py: Simplify logic of qmake and qtpaths lookup
If an explicit qmake or qtpaths option is given, use it
to determine the Qt prefix dir.
If no option is specified, try to find qtpaths in PATH.
Don't try to find the sibling tool as we did before this change,
there's no benefit in doing that. Either one can be used to query
the required Qt information.
Make sure to log both tool paths.
Amends 3b4764fefbb349eafb831b5da90f565b34c77a52
Change-Id: I03afaa8d8476b3d09affdde28f3ff6f1fdf652b6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit ed095a59eb91b48bd4e62e0b3d6005ab2d058d17)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 268b1fbc2..df1b29688 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -616,6 +616,7 @@ class PysideBuild(_build, DistUtilsCommandMixin): log.info(f"Python scripts: {self.py_scripts_dir}") log.info("-" * 3) log.info(f"Qt qmake: {self.qtinfo.qmake_command}") + log.info(f"Qt qtpaths: {self.qtinfo.qtpaths_command}") log.info(f"Qt version: {self.qtinfo.version}") log.info(f"Qt bins: {self.qtinfo.bins_dir}") log.info(f"Qt docs: {self.qtinfo.docs_dir}") |