Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-04-04 20:52:32 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-04-04 20:52:32 (GMT) |
| commit | 083c511d9861e06b1b7559936020a2fba04cb11c (patch) | |
| tree | ada14d771ba518cd406f30b6ee72ad7a893d30fd | |
| parent | 1c187749ec460ae196bfc7d56c1ec83566dbc7e2 (diff) | |
| download | swift-083c511d9861e06b1b7559936020a2fba04cb11c.zip swift-083c511d9861e06b1b7559936020a2fba04cb11c.tar.bz2 | |
Include QtXMLPatterns4 in Windows installs. Bumps requirement for packaging on Windows to Qt-4.6
| -rw-r--r-- | Swift/Packaging/nsis/swift.nsi | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi index 1d419a6..862e841 100644 --- a/Swift/Packaging/nsis/swift.nsi +++ b/Swift/Packaging/nsis/swift.nsi @@ -51,6 +51,7 @@ File "..\..\QtUI\Swift\QtCore4.dll" File "..\..\QtUI\Swift\QtGui4.dll" File "..\..\QtUI\Swift\QtWebKit4.dll" File "..\..\QtUI\Swift\QtNetwork4.dll" +File "..\..\QtUI\Swift\QtXMLPatterns4.dll" SetOutPath $INSTDIR\imageformats @@ -114,6 +115,7 @@ section "Uninstall" delete $INSTDIR\QtGui4.dll delete $INSTDIR\QtWebKit4.dll delete $INSTDIR\QtNetwork4.dll + delete $INSTDIR\QtXMLPatterns4.dll delete $INSTDIR\imageformats\qgif4.dll delete $INSTDIR\imageformats\qico4.dll delete $INSTDIR\imageformats\qjpeg4.dll diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 9980b45..9f6105e 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -134,7 +134,7 @@ if env["PLATFORM"] == "win32" : os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"), ], qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"], - qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"]) + qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"]) myenv.Append(NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", |