diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-01-05 15:28:43 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-01-06 09:50:01 +0000 |
| commit | 843bb81dcf03f80de9c51cfa4c32e31c4e207deb (patch) | |
| tree | 8f5913890c11bd6dd82f0733c5c8651999f64238 /build_scripts | |
| parent | 8908687e5b8eb5f5d054d2a76b4d9e9a19cd38fd (diff) | |
py3.10-prep: Fix parser.py for changed typing module amend
Undo wrong changes related to the Qt/resources copying.
Change-Id: I8ce54cce07a3aeceb9ae4621dd2512ecb2a6c1d1
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, 12 insertions, 0 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index be71660c9..712739e05 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -105,6 +105,12 @@ 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 6f58ea222..7932db337 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -160,6 +160,12 @@ 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" |