summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-01 15:08:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-01 15:08:17 (GMT)
commit7ff184d4c980752d6e0c4f38a2eaadce4dead6f2 (patch)
tree998972188cd8046fb3d1c9aa3fd957ada2339300 /BuildTools/SCons
parent1653a7260f5fdd35c7569a9fd541d6194a46ff1c (diff)
downloadswift-contrib-7ff184d4c980752d6e0c4f38a2eaadce4dead6f2.zip
swift-contrib-7ff184d4c980752d6e0c4f38a2eaadce4dead6f2.tar.bz2
Fix incorrectly bundled Qt image plugins.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 1cada9d..bc690af 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,10 +1,12 @@
import SCons.Util, os
def generate(env) :
- def createWindowsBundle(env, bundle, resources = [], qtlibs = []) :
+ def createWindowsBundle(env, bundle, resources = [], qtimageformats = [], qtlibs = []) :
env.Install(bundle, bundle + ".exe")
for lib in qtlibs :
env.Install(bundle, os.path.join(env["QTDIR"], "bin", lib + ".dll"))
+ env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in qtimageformats])
+
for resource in resources :
env.Install(bundle, resource)