4 files changed, 51 insertions, 19 deletions
diff --git a/BuildTools/SCons/Tools/Flags.py b/BuildTools/SCons/Tools/Flags.py
index 13fbb32..c130faf 100644
--- a/BuildTools/SCons/Tools/Flags.py
+++ b/BuildTools/SCons/Tools/Flags.py
@@ -3,7 +3,10 @@ import SCons.Util
 def generate(env) :
   def useFlags(env, flags) :
     for flag in flags :
-      env[flag] = env.get(flag, []) + flags[flag]
+      if flag in env :
+        env[flag] = env[flag] + flags[flag]
+      else :
+        env[flag] = flags[flag]
   env.AddMethod(useFlags, "UseFlags")
 
 def exists(env) :
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py
index c52f448..95fcce9 100644
--- a/BuildTools/SCons/Tools/Test.py
+++ b/BuildTools/SCons/Tools/Test.py
@@ -19,13 +19,24 @@ def generate(env) :
 			for i in ["HOME", "USERPROFILE", "APPDATA"]:
 				if os.environ.get(i, "") :
 					test_env["ENV"][i] = os.environ[i]
-			if test_env["PLATFORM"] == "darwin" :
-				test_env["ENV"]["DYLD_FALLBACK_LIBRARY_PATH"] = ":".join(map(lambda x : str(x), test_env.get("LIBPATH", [])))
-			elif test_env["PLATFORM"] == "win32" :
-				test_env["ENV"]["PATH"] = ";".join(map(lambda x : str(x), test_env.get("LIBRUNPATH", []))) + ";" + test_env["ENV"]["PATH"]
+			if env["target"] == "android" :
+				test_env["ENV"]["PATH"] = env["android_sdk_bin"] + ";" + test_env["ENV"]["PATH"]
+			else :
+				if test_env["PLATFORM"] == "darwin" :
+					test_env["ENV"]["DYLD_FALLBACK_LIBRARY_PATH"] = ":".join(map(lambda x : str(x), test_env.get("LIBPATH", [])))
+				elif test_env["PLATFORM"] == "win32" :
+					test_env["ENV"]["PATH"] = ";".join(map(lambda x : str(x), test_env.get("LIBRUNPATH", []))) + ";" + test_env["ENV"]["PATH"]
+
 
 			# Run the test
-			test_env.Command("**dummy**", target, 
+			if env["target"] == "android":
+				exec_name = os.path.basename(cmd)
+				test_env.Command("**dummy**", target, SCons.Action.Action(
+					["adb shell mount -o rw,remount /system",
+					"adb push " + cmd + " /system/bin/" + exec_name, 
+					"adb shell SWIFT_CLIENTTEST_JID=\"" + os.getenv("SWIFT_CLIENTTEST_JID") + "\" SWIFT_CLIENTTEST_PASS=\"" + os.getenv("SWIFT_CLIENTTEST_PASS") + "\" " + env.get("TEST_RUNNER", "") + "/system/bin/" + exec_name], cmdstr = "$TESTCOMSTR"))
+			else :
+				test_env.Command("**dummy**", target, 
 					SCons.Action.Action(ignore_prefix + env.get("TEST_RUNNER", "") + cmd + " " + params, cmdstr = "$TESTCOMSTR"))
 
 	def registerScriptTests(env, scripts, name, type) :
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index c3c77aa..2915141 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -1,12 +1,16 @@
 import SCons.Util, os
 
 def generate(env) :
-  def createWindowsBundle(env, bundle, resources = {}, qtimageformats = [], qtlibs = []) :
+  def createWindowsBundle(env, bundle, resources = {}, qtplugins = {}, qtlibs = [], qtversion = '4') :
     all_files = []
     all_files += env.Install(bundle, bundle + ".exe")
     for lib in qtlibs :
       all_files += env.Install(bundle, os.path.join(env["QTDIR"], "bin", lib + ".dll"))
-    all_files += env.Install(os.path.join(bundle, "imageformats"), [os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in qtimageformats])
+    plugins_suffix = '4'
+    if qtversion == '5' :
+      plugins_suffix = ''
+    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/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 671fd08..02701e7 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -286,9 +286,9 @@ def generate(env):
 
 		# Commands for the qt support ...
 		QT4_UICCOM = '$QT4_UIC $QT4_UICFLAGS -o $TARGET $SOURCE',
-    # FIXME: The -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED flag is a hack to work
-    # around an issue in Qt
-    # See https://bugreports.qt-project.org/browse/QTBUG-22829
+		# FIXME: The -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED flag is a hack to work
+		# around an issue in Qt
+		# See https://bugreports.qt-project.org/browse/QTBUG-22829
 		QT4_MOCFROMHCOM = '$QT4_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED $QT4_MOCFROMHFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE',
 		QT4_MOCFROMCXXCOM = [
 			'$QT4_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED $QT4_MOCFROMCXXFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE',
@@ -395,7 +395,7 @@ def generate(env):
 	# TODO: Does dbusxml2cpp need an adapter
 	env.AddMethod(enable_modules, "EnableQt4Modules")
 
-def enable_modules(self, modules, debug=False, crosscompiling=False) :
+def enable_modules(self, modules, debug=False, crosscompiling=False, version='4') :
 	import sys
 
 	validModules = [
@@ -420,6 +420,11 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 		'QtWebKit',
 		'QtHelp',
 		'QtScript',
+
+		# Qt5 modules
+		'QtWidgets',
+		'QtMultimedia',
+		'QtWebKitWidgets',
 		]
 	staticModules = [
 		'QtUiTools',
@@ -440,6 +445,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 		'QtXml'			 : ['QT_XML_LIB'],
 		'QtOpenGL'	 : ['QT_OPENGL_LIB'],
 		'QtGui'			 : ['QT_GUI_LIB'],
+		'QtWidgets'  : ['QT_WIDGETS_LIB'],
+		'QtWebKitWidgets' : [],
 		'QtNetwork'  : ['QT_NETWORK_LIB'],
 		'QtCore'		 : ['QT_CORE_LIB'],
 	}
@@ -450,7 +457,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 
 	if sys.platform.startswith("linux") and not crosscompiling :
 		if debug : debugSuffix = '_debug'
-		self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
+		if version == '4' :
+			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
 		for module in modules :
 			self.AppendUnique(LIBS=[module+debugSuffix])
 			self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
@@ -471,12 +479,17 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","QtAssistant")])
 			modules.remove("QtAssistant")
 			modules.append("QtAssistantClient")
-		# FIXME: Phonon Hack
-		self.AppendUnique(LIBS=['phonon'+debugSuffix+'4'])
-		self.AppendUnique(LIBS=[lib+debugSuffix+'4' for lib in modules if lib not in staticModules])
+		if version == '4' :
+			# FIXME: Phonon Hack
+			self.AppendUnique(LIBS=['phonon'+debugSuffix+version])
+			self.AppendUnique(LIBS=[lib+debugSuffix+version for lib in modules if lib not in staticModules])
+		else :
+			self.AppendUnique(LIBS=[lib.replace('Qt', 'Qt5') + debugSuffix for lib in modules if lib not in staticModules])
 		self.PrependUnique(LIBS=[lib+debugSuffix for lib in modules if lib in staticModules])
 		if 'QtOpenGL' in modules:
 			self.AppendUnique(LIBS=['opengl32'])
+		elif version == '5' :
+			self.Append(CPPDEFINES = ["QT_NO_OPENGL"])
 		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'])
 		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'+module for module in modules])
 		if crosscompiling :
@@ -498,7 +511,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 			self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean!
 
 		# FIXME: Phonon Hack
-		self.Append(LINKFLAGS=['-framework', "phonon"])
+		if version == '4' :
+			self.Append(LINKFLAGS=['-framework', "phonon"])
 
 		for module in modules :
 			if module in staticModules :
@@ -506,9 +520,9 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
 				self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
 			else :
 				if len(self["QTDIR"]) > 0 :
-					self.Append(CPPFLAGS = ["-I" + os.path.join("$QTDIR", "lib", module + ".framework", "Versions", "4", "Headers")])
+					self.Append(CPPFLAGS = ["-I" + os.path.join("$QTDIR", "lib", module + ".framework", "Versions", version, "Headers")])
 				else :
-					self.Append(CPPFLAGS = ["-I" + os.path.join("/Library/Frameworks", module + ".framework", "Versions", "4", "Headers")])
+					self.Append(CPPFLAGS = ["-I" + os.path.join("/Library/Frameworks", module + ".framework", "Versions", version, "Headers")])
 				self.Append(LINKFLAGS=['-framework', module])
 		if 'QtOpenGL' in modules:
 			self.AppendUnique(LINKFLAGS="-F/System/Library/Frameworks")