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 | |||
| @@ -101,14 +101,14 @@ def generate(env) : | |||
| 101 | qt_plugin_regex = re.compile(ur".*plugins.*\\(.*)\\(.*)\.dll") | 101 | qt_plugin_regex = re.compile(ur".*plugins.*\\(.*)\\(.*)\.dll") |
| 102 | for (src_path, target_path) in qtmappings: | 102 | for (src_path, target_path) in qtmappings: |
| 103 | if qt_plugin_regex.match(src_path): | 103 | if qt_plugin_regex.match(src_path): |
| 104 | plugin_folder, filename = qt_plugin_regex.match(src_path).groups() | 104 | plugin_folder, filename = qt_plugin_regex.match(src_path).groups() |
| 105 | try: | 105 | try: |
| 106 | if filename[1:] in qtplugins[plugin_folder]: | 106 | if plugin_folder in ["audio"] or filename[1:] in qtplugins[plugin_folder]: |
| 107 | all_files += env.Install(os.path.join(bundle, plugin_folder), src_path) | 107 | all_files += env.Install(os.path.join(bundle, plugin_folder), src_path) |
| 108 | except: | 108 | except: |
| 109 | pass | 109 | pass |
| 110 | return all_files | 110 | return all_files |
| 111 | 111 | ||
| 112 | def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4'): | 112 | def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4'): |
| 113 | if which("windeployqt.exe"): | 113 | if which("windeployqt.exe"): |
| 114 | return createWindowsBundleWithWinDeployQt(env, bundle, resources, qtplugins, qtlibs, qtversion) | 114 | return createWindowsBundleWithWinDeployQt(env, bundle, resources, qtplugins, qtlibs, qtversion) |