summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-08-09 15:14:04 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-08-09 15:14:04 (GMT)
commit3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f (patch)
tree6ffb2d9d31166094fa3b61870f84afdc17964cf8 /BuildTools/SCons
parentc651cda1d427fe441f6acbd94952705efd218dd1 (diff)
downloadswift-contrib-3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f.zip
swift-contrib-3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f.tar.bz2
Include accessibility plugin in Windows packages
Change-Id: I9bff93b9bd9d81cec4143d0ba35a1045077e1e82
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index aac1c32..2915141 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,7 +1,7 @@
import SCons.Util, os
def generate(env) :
- def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = [], qtplatforms = [], qtversion = '4') :
+ def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4') :
all_files = []
all_files += env.Install(bundle, bundle + ".exe")
for lib in qtlibs :
@@ -9,8 +9,8 @@ def generate(env) :
plugins_suffix = '4'
if qtversion == '5' :
plugins_suffix = ''
- all_files += env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + plugins_suffix + ".dll") for codec in qtimageformats])
- all_files += env.Install(os.path.join(bundle, "platforms"), [os.path.join(env["QTDIR"], "plugins", "platforms", "q" + platform + plugins_suffix + ".dll") for platform in qtplatforms])
+ for plugin_type in qtplugins:
+ all_files += env.Install(os.path.join(bundle, plugin_type), [os.path.join(env["QTDIR"], "plugins", plugin_type, "q" + plugin + plugins_suffix + ".dll") for plugin in qtplugins[plugin_type]])
for dir, resourceFiles in resources.items() :
for resource in resourceFiles :