Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-24 07:52:05 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-09-24 07:54:03 (GMT) |
| commit | 2609a8a63662dfea9dccce2fd135b11a8d6c7875 (patch) | |
| tree | 453469d92c3efab5da602b3b0a981b4e808ca74b | |
| parent | 9bfa3150fe9fac684a08e584a23249f918c188d9 (diff) | |
| download | swift-2609a8a63662dfea9dccce2fd135b11a8d6c7875.zip swift-2609a8a63662dfea9dccce2fd135b11a8d6c7875.tar.bz2 | |
Always include Qt5 audio plugins for Windows packages
At some point during the Qt5 timeline they moved platform
dependent audio playback code into a plugin. This fix will
ensure that audio plugins are always shipped with out packages.
Test-Information:
Tested playing sound works on Windows 7 and Windows 8.
Change-Id: I8976f1c1fb85d5efaadec5db26adec907a0a9f7b
| -rw-r--r-- | BuildTools/SCons/Tools/WindowsBundle.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py index 5afb56e..ef77acb 100644 --- a/BuildTools/SCons/Tools/WindowsBundle.py +++ b/BuildTools/SCons/Tools/WindowsBundle.py @@ -103,10 +103,10 @@ def generate(env) : if qt_plugin_regex.match(src_path): plugin_folder, filename = qt_plugin_regex.match(src_path).groups() try: - if filename[1:] in qtplugins[plugin_folder]: + if plugin_folder in ["audio"] or filename[1:] in qtplugins[plugin_folder]: all_files += env.Install(os.path.join(bundle, plugin_folder), src_path) except: - pass + pass return all_files def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4'): |