diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-18 16:45:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-18 16:45:35 +0200 |
| commit | 3f8c8702ea295f39357e7c66f46e5138f56bcc9f (patch) | |
| tree | 9ca65a7f94d544ba4b36f239c4a48852ad8a7b09 /build_scripts/platforms/windows_desktop.py | |
| parent | 5fce76074c01e52a22151133a1e3a2cf71cfe535 (diff) | |
| parent | df1a619d65d8e5db91f3c8db46b00872b461e334 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I20cf741f5b07426ad5113eb8c52f144102c331ce
Diffstat (limited to 'build_scripts/platforms/windows_desktop.py')
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 6a18659c5..f4b4aed6e 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -180,8 +180,6 @@ def prepare_packages_win32(self, vars): qt_artifacts_permanent = [ "opengl*.dll", "d3d*.dll", - "libEGL*.dll", - "libGLESv2*.dll", "designer.exe", "linguist.exe", "lrelease.exe", @@ -189,6 +187,21 @@ def prepare_packages_win32(self, vars): "lconvert.exe", "qtdiag.exe" ] + + # Choose which EGL library variants to copy. + qt_artifacts_egl = [ + "libEGL{}.dll", + "libGLESv2{}.dll" + ] + if self.qtinfo.build_type != 'debug_and_release': + egl_suffix = '*' + elif self.debug: + egl_suffix = 'd' + else: + egl_suffix = '' + qt_artifacts_egl = [a.format(egl_suffix) for a in qt_artifacts_egl] + qt_artifacts_permanent += qt_artifacts_egl + copydir("{qt_bin_dir}", "{pyside_package_dir}/PySide2", filter=qt_artifacts_permanent, recursive=False, vars=vars) @@ -273,18 +286,21 @@ def prepare_packages_win32(self, vars): # <qt>/qml/* -> <setup>/PySide2/qml qml_dll_patterns = ["*{}.dll"] qml_ignore_patterns = qml_dll_patterns + [pdb_pattern] - # Remove the "{}" from the patterns qml_ignore = [a.format('') for a in qml_ignore_patterns] - if copy_pdbs: - qml_dll_patterns += [pdb_pattern] - qml_ignore = [a.format('') for a in qml_dll_patterns] - qml_dll_filter = functools.partial(qt_build_config_filter, - qml_dll_patterns) + + # Copy all files that are not dlls and pdbs (.qml, qmldir). copydir("{qt_qml_dir}", "{pyside_package_dir}/PySide2/qml", ignore=qml_ignore, force=False, recursive=True, vars=vars) + + if copy_pdbs: + qml_dll_patterns += [pdb_pattern] + qml_dll_filter = functools.partial(qt_build_config_filter, + qml_dll_patterns) + + # Copy all dlls (and possibly pdbs). copydir("{qt_qml_dir}", "{pyside_package_dir}/PySide2/qml", file_filter_function=qml_dll_filter, force=False, |