diff options
| author | Christian Tismer <tismer@stackless.com> | 2021-05-08 16:06:23 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-01-05 12:11:47 +0100 |
| commit | c77bed5125660d6ad173321e1e40b6220795a976 (patch) | |
| tree | 93e699f348639849f0fcf44e0cdeaa4398ac8c0f /build_scripts | |
| parent | 49517d06cb09e36ecf00228bc8fa862a722842ed (diff) | |
py3.10-prep: Fix parser.py for changed typing module
The typing module has subtle changes that are not even
documented: Typing types now have a __name__ attribute.
That confused the parser of the pyi generator because
suddenly stingizing
Callable[..., Optional[str]]
resulted in
Callable[..., Optional]
because of special rules that return the generic name
of a typing type, which was very unexpected. Finding this bug
took a lot of debugging of the recursive `_resolve_type`
function.
We finally move the debugging_aid string as a function into
lib/tool.py, because this was very helpful.
Some changes are not valid in 5.15, because there were other
modification in 6.x source code, like f-string, and some Qt install dir
struncture, like Qt/resources.
[ChangeLog][shiboken6] The parser for .pyi files needed an update
because of undocumented changes in typing.py for Python 3.10 .
Task-number: PYSIDE-1436
Change-Id: I3b8f2c1aa52a23014a8a915a0c677af96dfc536f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 2530cb3f165ac02b8f7132e3f5ab4f7f6896dbd9)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/platforms/linux.py | 6 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 712739e05..be71660c9 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -105,12 +105,6 @@ def prepare_standalone_package_linux(self, vars): recursive=False, vars=vars) - copydir("{qt_prefix_dir}/resources", - "{st_build_dir}/{st_package_name}/Qt/resources", - filter=None, - recursive=False, - vars=vars) - if copy_plugins: # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins copydir("{qt_plugins_dir}", diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 7932db337..6f58ea222 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -160,12 +160,6 @@ def prepare_standalone_package_macos(self, vars): recursive=False, vars=vars) - copydir("{qt_prefix_dir}/resources", - "{st_build_dir}/{st_package_name}/Qt/resources", - filter=None, - recursive=False, - vars=vars) - # Fix rpath for WebEngine process executable. qt_libexec_path = "{st_build_dir}/{st_package_name}/Qt/libexec".format(**vars) binary = "QtWebEngineProcess" |