From 2609a8a63662dfea9dccce2fd135b11a8d6c7875 Mon Sep 17 00:00:00 2001 From: Tobias Markmann <tm@ayena.de> Date: Thu, 24 Sep 2015 09:52:05 +0200 Subject: 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 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'): -- cgit v0.10.2-6-g49f6