diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-07 11:14:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-07 14:33:54 +0000 |
| commit | ac664fec50a57545e46bcb37f929e65a4dd7c536 (patch) | |
| tree | 69343c4734dad571b8c4068f50a440b7884aad91 /scripts | |
| parent | b4430b61e651806cb56c5ab5206042f5004e3d33 (diff) | |
| download | qt-creator-ac664fec50a57545e46bcb37f929e65a4dd7c536.tar.gz | |
Windows/deployqt: Only ship necessary version of EGL/GLES libs
Task-number: QTCREATORBUG-8296
Change-Id: Idf27427715f3234c077466b623d32829577f13c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 5322036512..64dbe426e3 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -89,6 +89,10 @@ def op_failed(details = None): def is_ignored_windows_file(use_debug, basepath, filename): ignore_patterns = ['.lib', '.pdb', '.exp', '.ilk'] + if use_debug: + ignore_patterns.extend(['libEGL.dll', 'libGLESv2.dll']) + else: + ignore_patterns.extend(['libEGLd.dll', 'libGLESv2d.dll']) for ip in ignore_patterns: if filename.endswith(ip): return True @@ -120,7 +124,7 @@ def copy_qt_libs(target_qt_prefix_path, qt_libs_dir, qt_plugin_dir, qt_import_di os.makedirs(lib_dest) if common.is_windows_platform(): - libraries = [lib for lib in libraries if debug_build == is_debug(lib)] + libraries = [lib for lib in libraries if not is_ignored_windows_file(debug_build, '', lib)] for library in libraries: print library, '->', lib_dest |