aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2020-06-16 08:07:12 +0300
committerSimo Fält <simo.falt@qt.io>2020-09-09 12:59:05 +0000
commitd6a664cce309fbd79a2d37d47a48580a44bdff73 (patch)
treee8f0dcceb412aca85a3e4fd93130f0426257116d
parent574a677e7f9ed2633fb2dae57ada23f1a758d7c3 (diff)
One more fix for the missing win runtime libs
Change-Id: Ic430a687a6d7af7ba45df51a34c6fe7c56b3799d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 275aba0c773e649f15c89e34f15310cb8fd35c09) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--build_scripts/platforms/windows_desktop.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index 49c384bc7..345847e20 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -240,6 +240,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):
@@ -252,7 +253,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.