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 /Swift/QtUI
parent1653a7260f5fdd35c7569a9fd541d6194a46ff1c (diff)
downloadswift-7ff184d4c980752d6e0c4f38a2eaadce4dead6f2.zip
swift-7ff184d4c980752d6e0c4f38a2eaadce4dead6f2.tar.bz2
Fix incorrectly bundled Qt image plugins.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index c70f8a0..ee1c762 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -110,8 +110,9 @@ if env["PLATFORM"] == "win32" :
myenv.WindowsBundle("Swift", resources = [
os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),
os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
- [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in ["gif", "ico", "jpeg", "mng", "svg", "tiff"]]
- ], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
+ ],
+ qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"],
+ qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
myenv.Append(NSIS_OPTIONS = [
"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",