diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-26 17:36:26 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-12-07 15:24:41 +0100 |
| commit | f9c925261c1835a723407b3f81fbfd09aaf0b004 (patch) | |
| tree | a0279a4dc77dc8b8ab6a7fced869ae5b9cde8367 /build_scripts | |
| parent | 30e4777956513daeba0f55cef50de4881d0bb2f1 (diff) | |
setup.py: Deprecate qmake option in favor of qtpaths
The setup.py --qmake option is deprecated starting with Qt 6.3 and
will likely be removed in Qt 6.4.
The --qtpaths option should be used instead.
Change Coin build instructions to use qtpaths. Documentation builds
should also be adapted.
Coin test instructions still use qmake for wheel_tester.py
[ChangeLog][setup.py] The setup.py --qmake option is deprecated
starting with Qt 6.3. Use the --qtpaths option instead.
Change-Id: I0f5661162f70b38ce0c9939620e7dbb3151050fd
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/options.py | 1 | ||||
| -rw-r--r-- | build_scripts/utils.py | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py index fdf246e26..045eb05d0 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -357,6 +357,7 @@ class DistUtilsCommandMixin(object): # Enforce usage of qmake in QtInfo if it was given explicitly. if self.qmake: self.has_qmake_option = True + _warn_deprecated_option('qmake', 'qtpaths') # If no option was given explicitly, prefer to find qtpaths # in PATH. diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 4b91bd493..10af2725f 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1220,6 +1220,16 @@ def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): return True +def get_ci_qtpaths_path(ci_install_dir, ci_host_os): + qtpaths_path = f"--qtpaths={ci_install_dir}" + if ci_host_os == "MacOS": + return f"{qtpaths_path}/bin/qtpaths" + elif ci_host_os == "Windows": + return f"{qtpaths_path}\\bin\\qtpaths.exe" + else: + return f"{qtpaths_path}/bin/qtpaths" + + def get_ci_qmake_path(ci_install_dir, ci_host_os): qmake_path = f"--qmake={ci_install_dir}" if ci_host_os == "MacOS": |