From ef8a0cc0c43d414af8133a4eecf0c3e754ec3de4 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sat, 2 Apr 2016 15:24:13 +0200
Subject: [PATCH] Update vcredist to MSVC2015

refs #615 #616
---
 install.pri                           |  6 +++---
 installer/installbuilder/vcredist.xml | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/install.pri b/install.pri
index 5367ed788..83753294f 100644
--- a/install.pri
+++ b/install.pri
@@ -68,12 +68,12 @@ INSTALLS += dbus_target dbus_config_target
 
 ############### Install VC runtime ##############
 
-win32-msvc2013 {
+win32-msvc2015 {
     equals(WORD_SIZE,64) {
-         vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x64.exe
+         vc_redist_target.files *= $$(VS140COMNTOOLS)../../VC/redist/1033/vcredist_x64.exe
     }
     equals(WORD_SIZE,32) {
-        vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x86.exe
+        vc_redist_target.files *= $$(VS140COMNTOOLS)../../VC/redist/1033/vcredist_x86.exe
     }
     vc_redist_target.path *= $${PREFIX}/vcredist
     INSTALLS += vc_redist_target
diff --git a/installer/installbuilder/vcredist.xml b/installer/installbuilder/vcredist.xml
index fc315c9b8..c216ff108 100644
--- a/installer/installbuilder/vcredist.xml
+++ b/installer/installbuilder/vcredist.xml
@@ -6,42 +6,42 @@
     <show>1</show>
     <folderList>
         <folder>
-            <description>bin</description>
+            <description>vcredist</description>
             <destination>${installdir}/vcredist</destination>
-            <name>share_windows</name>
+            <name>vcredist</name>
             <platforms>windows</platforms>
             <actionList>
                 <runProgram>
-                    <program>${installdir}/vcredist_x86.exe</program>
+                    <program>${installdir}/vcredist/vcredist_x86.exe</program>
                     <programArguments>/install /quiet /norestart</programArguments>
-                    <progressText>Installing VC++ 2013 runtime</progressText>
+                    <progressText>Installing VC++ 2015 32 Bit Runtime</progressText>
                     <ruleList>
                         <registryTest>
-                            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86</key>
-                            <logic>exists</logic>
+                            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86</key>
+                            <logic>does_not_exist</logic>
                             <name>Installed</name>
                             <type>REG_DWORD</type>
                             <wowMode>32</wowMode>
                         </registryTest>
                         <fileExists>
-                            <path>${installdir}/vcredist_x86.exe</path>
+                            <path>${installdir}/vcredist/vcredist_x86.exe</path>
                         </fileExists>
                     </ruleList>
                 </runProgram>
                 <runProgram>
-                    <program>${installdir}/vcredist_x64.exe</program>
+                    <program>${installdir}/vcredist/vcredist_x64.exe</program>
                     <programArguments>/install /quiet /norestart</programArguments>
-                    <progressText>Installing VC++ 2013 runtime</progressText>
+                    <progressText>Installing VC++ 2015 64 Bit Runtime</progressText>
                     <ruleList>
                         <registryTest>
-                            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x64</key>
-                            <logic>exists</logic>
+                            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64</key>
+                            <logic>does_not_exist</logic>
                             <name>Installed</name>
                             <type>REG_DWORD</type>
                             <wowMode>64</wowMode>
                         </registryTest>
                         <fileExists>
-                            <path>${installdir}/vcredist_x64.exe</path>
+                            <path>${installdir}/vcredist/vcredist_x64.exe</path>
                         </fileExists>
                     </ruleList>
                 </runProgram>