add support for VS2015 in the build script

Also pull in the Qt 4.8 build fixes from
https://codereview.qt-project.org/122364
https://codereview.qt-project.org/122365

INSTALL.md

@@ -79,9 +79,8 @@ native package (either DEB or RPM, depending on the distribution) in the
 Windows
 -------
 
-* Install Visual Studio 2013 Update 4 -- [Community Edition](http://go.microsoft.com/?linkid=9863609)
-  should also work.
-* Do "Windows Update" to ensure that VC/SDK security patches are up-to-date
+* Install Visual Studio [2013 (update 5)](https://go.microsoft.com/fwlink/?LinkId=532496)
+  or Visual Studio [2015 (update 3)](https://go.microsoft.com/fwlink/?LinkId=615448).
 * Install the latest [ActivePerl](http://www.activestate.com/activeperl/downloads) release
 * Install the latest [Python 2.7](http://www.python.org/downloads/windows/) release
 * Install [NSIS 2.46](http://nsis.sourceforge.net/Download)
@@ -91,6 +90,7 @@ Windows
 Target          | Building 32-bit binaries               |  Building 64-bit binaries
 ------          | ------------------------               |  ------------------------
 MSVC 2013       | `scripts\build.py msvc2013-win32`      | `scripts/build.py msvc2013-win64`
+MSVC 2015       | `scripts\build.py msvc2015-win32`      | `scripts/build.py msvc2015-win64`
 
 During the build, a working internet connection is required to download and
 compile the dependent libraries (e.g. OpenSSL). The output installers should

qt

@@ -1 +1 @@
-Subproject commit 8dae19a82231e87366d81c683bafcb025aea9c1d
+Subproject commit aa08ff44ef7f0084d902433a050d1a20d968254c

scripts/build.py

@@ -31,6 +31,8 @@ BUILDERS = {
     'source-tarball':        'source_tarball',
     'msvc2013-win32':        'msvc',
     'msvc2013-win64':        'msvc',
+    'msvc2015-win32':        'msvc',
+    'msvc2015-win64':        'msvc',
     'setup-mingw-w64':       'setup_mingw_w64',
     'setup-schroot-generic': 'setup_schroot',
     'setup-schroot-centos7': 'setup_schroot',
@@ -842,11 +844,14 @@ def build_source_tarball(config, basedir):
 # --------------------------------------------------------------- MSVC (2013 only)
 
 MSVC_LOCATION = {
-    'msvc2013': ('VS120COMNTOOLS', '12.0')
+    'msvc2013': ('VS120COMNTOOLS', '12.0'),
+    'msvc2015': ('VS140COMNTOOLS', '14.0')
 }
 MSVC_RUNTIME = {
     'msvc2013-win32': ('df7f0a73bfa077e483e51bfb97f5e2eceedfb6a3', 'http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe'),
-    'msvc2013-win64': ('8bf41ba9eef02d30635a10433817dbb6886da5a2', 'http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe')
+    'msvc2013-win64': ('8bf41ba9eef02d30635a10433817dbb6886da5a2', 'http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe'),
+    'msvc2015-win32': ('bfb74e498c44d3a103ca3aa2831763fb417134d1', 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe'),
+    'msvc2015-win64': ('3155cb0f146b927fcc30647c1a904cd162548c8c', 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe')
 }
 
 def check_msvc(config):