diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-15 10:25:25 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-17 06:56:48 +0200 |
| commit | 8e731da36ee8616f2da005f19c7a6c8c02665118 (patch) | |
| tree | e55f2d21495816db6403e30fc3f8ff2e40032745 /build_scripts/main.py | |
| parent | 099d6c09f704a6f8ace929e5522c5fd655e14215 (diff) | |
Introduce qtpaths as qmake replacement
qtpaths has become the recommended tool for querying Qt properties
(see qtbase/fef850c51a069ed89ba400e6ffccbbea4b0cbb9f). Deprecate the
--qmake option in favor of it and use qtpaths for the values. qmake is
only used if a path is given on the command line.
[ChangeLog][PySide6] qtpaths is now used to query Qt properties.
Task-number: QTBUG-75870
Change-Id: I9a29b05d8b6e982647eeeeeda0134ddc807da141
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 9e898987d..ed1c42f32 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -500,7 +500,9 @@ class PysideBuild(_build, DistUtilsCommandMixin): self.py_scripts_dir = py_scripts_dir self.qtinfo = QtInfo() - qt_dir = os.path.dirname(OPTION["QMAKE"]) + qt_dir = os.path.dirname(OPTION["QTPATHS"]) + if OPTION['HAS_QMAKE_OPTION']: + qt_dir = os.path.dirname(OPTION["QMAKE"]) qt_version = get_qt_version() # Update the PATH environment variable |