From 3eefe28a2f6cc1e33d9d2b0bad7f9c6f2146352f Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Fri, 9 Aug 2013 16:14:04 +0100
Subject: Include accessibility plugin in Windows packages

Change-Id: I9bff93b9bd9d81cec4143d0ba35a1045077e1e82

diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index aac1c32..2915141 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,7 +1,7 @@
 import SCons.Util, os
 
 def generate(env) :
-  def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = [], qtplatforms = [], qtversion = '4') :
+  def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4') :
     all_files = []
     all_files += env.Install(bundle, bundle + ".exe")
     for lib in qtlibs :
@@ -9,8 +9,8 @@ def generate(env) :
     plugins_suffix = '4'
     if qtversion == '5' :
       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 plugin_type in qtplugins:
+      all_files += env.Install(os.path.join(bundle, plugin_type), [os.path.join(env["QTDIR"], "plugins", plugin_type, "q" + plugin + plugins_suffix + ".dll") for plugin in qtplugins[plugin_type]])
 
     for dir, resourceFiles in resources.items() :
       for resource in resourceFiles :
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"] :
-- 
cgit v0.10.2-6-g49f6