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 /Swift/QtUI/SConscript
parentc651cda1d427fe441f6acbd94952705efd218dd1 (diff)
downloadswift-contrib-3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f.zip
swift-contrib-3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f.tar.bz2
Include accessibility plugin in Windows packages
Change-Id: I9bff93b9bd9d81cec4143d0ba35a1045077e1e82
Diffstat (limited to 'Swift/QtUI/SConscript')
-rw-r--r--Swift/QtUI/SConscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 42de762..1c3fd70 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -367,9 +367,9 @@ if env["PLATFORM"] == "win32" :
]
if env["SWIFTEN_DLL"] :
commonResources[""] = commonResources.get("", []) + ["#/Swiften/${SWIFTEN_LIBRARY_FILE}"]
- qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"]
+ qtplugins = {}
+ qtplugins["imageformats"] = ["gif", "ico", "jpeg", "mng", "svg", "tiff"]
qtlibs = ["QtCore", "QtGui", "QtNetwork", "QtWebKit", "QtXMLPatterns"]
- qtplatforms = []
if qt_version == '4' :
qtlibs.append("phonon")
qtlibs = [lib + '4' for lib in qtlibs]
@@ -377,12 +377,12 @@ if env["PLATFORM"] == "win32" :
qtlibs += ['QtQuick', 'QtQml', 'QtV8', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs]
qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL']
- qtplatforms = ['windows']
+ qtplugins["platforms"] = ['windows']
+ qtplugins["accessible"] = ["taccessiblewidgets"]
windowsBundleFiles = myenv.WindowsBundle("Swift",
resources = commonResources,
- qtimageformats = qtimageformats,
+ qtplugins = qtplugins,
qtlibs = qtlibs,
- qtplatforms = qtplatforms,
qtversion = qt_version)
if env["DIST"] :