summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-08-08 14:09:41 (GMT)
committerSwift Review <review@swift.im>2013-08-08 14:12:09 (GMT)
commitc651cda1d427fe441f6acbd94952705efd218dd1 (patch)
tree4537fb3235cfe40025a03e34920f0a23d44f9a04 /BuildTools/SCons
parent5d21021b92a3d7d5755e80a5be10cfbdf984b9db (diff)
downloadswift-c651cda1d427fe441f6acbd94952705efd218dd1.zip
swift-c651cda1d427fe441f6acbd94952705efd218dd1.tar.bz2
Package necessary plugins for qt5 on Windows
Change-Id: Icfcf31668a3bcba687885aab0e548a8b42c30773
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 2c0b3a4..aac1c32 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,15 +1,16 @@
import SCons.Util, os
def generate(env) :
- def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = [], qtversion = '4') :
+ def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = [], qtplatforms = [], qtversion = '4') :
all_files = []
all_files += env.Install(bundle, bundle + ".exe")
for lib in qtlibs :
all_files += env.Install(bundle, os.path.join(env["QTDIR"], "bin", lib + ".dll"))
- imageformats_suffix = '4'
+ plugins_suffix = '4'
if qtversion == '5' :
- imageformats_suffix = ''
- all_files += env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + imageformats_suffix + ".dll") for codec in qtimageformats])
+ 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 dir, resourceFiles in resources.items() :
for resource in resourceFiles :