From 9fccc6c70a7df8cae34429e0eda5b5fb1ec2d6b3 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Wed, 8 Aug 2018 01:46:38 +0200
Subject: [PATCH] Fix the MSVC 2017 redist version

MSVC 2017 was updated to v15.7 in Jenkins CI and with it also the redist
version numbers. However, the new version was never updated in the installer
and packaging project.
---
 install.pri                           | 6 +++---
 installer/installbuilder/vcredist.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.pri b/install.pri
index b4fb9d1e1..bdd052dd1 100644
--- a/install.pri
+++ b/install.pri
@@ -144,13 +144,13 @@ unix:!macx {
 
 ############### Install VC runtime ##############
 
-win32-msvc* {
+win32-msvc {
     PROGRAM_FILES = $$getenv(programfiles(x86))
     equals(WORD_SIZE,64) {
-        vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.11.25325/vcredist_x64.exe)
+        vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.14.26405/vcredist_x64.exe)
     }
     equals(WORD_SIZE,32) {
-        vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.11.25325/vcredist_x86.exe)
+        vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.14.26405/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 0b31081d5..05c8251dc 100644
--- a/installer/installbuilder/vcredist.xml
+++ b/installer/installbuilder/vcredist.xml
@@ -31,7 +31,7 @@
                         </fileExists>
                         <compareVersions>
                             <logic>greater</logic>
-                            <version1>14.11.25325.0</version1>
+                            <version1>v14.15.26706.0</version1>
                             <version2>${vcruntimeversionx86}</version2>
                         </compareVersions>
                     </ruleList>
@@ -46,7 +46,7 @@
                         </fileExists>
                         <compareVersions>
                             <logic>greater</logic>
-                            <version1>v14.11.25325.0</version1>
+                            <version1>v14.15.26706.0</version1>
                             <version2>${vcruntimeversionx64}</version2>
                         </compareVersions>
                     </ruleList>