diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2023-02-13 10:11:35 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2023-02-16 10:57:46 +0000 |
| commit | 978bf329f781c8b0c7261e72e245b63a5858b8f3 (patch) | |
| tree | e785a90d46cca09589df4980c7c846f2201c4d42 /build_scripts | |
| parent | 360b4cff664d798fd0078de0ac77863307ad8b3e (diff) | |
doc: fix build when qtpaths is in PATH
It seems that the previous changes:
bf73772d2c43a71d13a55e9914c631591cd01815
to determinate qtpaths earlier in the build didn't
consider the case where
setup.py build_rst_docs
was called with qtpaths in PATH, so this skip the process
for this subcommand.
Pick-to: 6.4
Change-Id: I89a28950a6416993ece204cc1b2eb3300165a272
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/options.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py index d384be2c9..e4593f71d 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -546,7 +546,8 @@ class CommandMixin(object): # We also don't do auto-searching if qt-target-path is passed # explicitly. This is to help with the building of host tools # while cross-compiling. - if not self.is_cross_compile and not self.qt_target_path: + # Skip this process for the 'build_rst_docs' command + if not self.is_cross_compile and not self.qt_target_path and 'build_rst_docs' not in sys.argv: # Enforce usage of qmake in QtInfo if it was given explicitly. if self.qmake: self.has_qmake_option = True |