diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-10 12:42:25 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-10 12:45:26 +0200 |
| commit | d4bc1ade3a8aae42915c1c71f4bac10414644ae0 (patch) | |
| tree | 94496a73808d58db1505a4034a4eedc0c8a3930d /build_scripts | |
| parent | 8f7de769636f36bcf371c472480adab75a32e0bf (diff) | |
| parent | 074e52bccfba94c97cc132060e7087f830756b26 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8a627fd459c3f9601d078a00d3d77c8b3fe04304
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index f8a776b87..112bd436f 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -239,6 +239,7 @@ def prepare_packages_win32(self, vars): if config.is_internal_pyside_build() or config.is_internal_shiboken_generator_build(): copy_qt_artifacts(self, copy_pdbs, vars) + copy_msvc_redist_files(vars, "{build_dir}/msvc_redist".format(**vars)) def copy_msvc_redist_files(vars, redist_target_path): @@ -251,7 +252,10 @@ def copy_msvc_redist_files(vars, redist_target_path): "vccorlib140.dll", "vcomp140.dll", "vcruntime140.dll", - "vcruntime140_1.dll" + "vcruntime140_1.dll", + "msvcp140_1.dll", + "msvcp140_2.dll", + "msvcp140_codecvt_ids.dll" ] # Make a directory where the files should be extracted. |