check the right vcredist registry value key

msvc2015 and msvc2017 are compatible but everything greater
or same 14.1 is a vcredist for msvc2017.
So install it if the minor part is smaller then 1.

Task-number: QTCREATORBUG-22204
Change-Id: I57572cecb41bd6ce1cebbc9cf3fded6f14f7d650
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

4 files changed, 8 insertions, 8 deletions

diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs
index 2a6cd1961..749434a6b 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/installscript.qs
@@ -29,8 +29,8 @@
 // constructor
 function Component()
 {
-    // only install c++ runtime if it is needed, no minor version check of the c++ runtime till we need it
-    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x64\\Installed") != 1)
+    // msvc2015 and msvc2017 are compatible but everything greater or same 14.1 is a vcredist for msvc2017.
+    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x64\\Minor") < 1)
         component.setValue("RequiresAdminRights", "true");
 }
 
@@ -40,7 +40,7 @@ Component.prototype.createOperations = function()
     // so that the simulator finds its fonts and applications find the simulator
     component.createOperations();
 
-    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x64\\Installed") != 1) {
+    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x64\\Minor") < 1) {
         // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
         // return value 5100 means there's a newer version of the runtime already installed
         component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_msvc2017_x64.exe", "/norestart", "/q");
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml
index 57ca644ca..5d8d51b1f 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x64/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>VCRedist for MSVC 2017 64bit</DisplayName>
     <Description>Visual C++ Redistributable Packages for Visual Studio 2017 64 bit</Description>
-    <Version>2019-02-13-0</Version>
+    <Version>2019-02-13-1</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Script>installscript.qs</Script>
     <Virtual>true</Virtual>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs
index a62b3913b..d71765a70 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/installscript.qs
@@ -29,8 +29,8 @@
 // constructor
 function Component()
 {
-    // only install c runtime if it is needed, no minor version check of the c runtime till we need it
-    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x86\\Installed") != 1)
+    // msvc2015 and msvc2017 are compatible but everything greater or same 14.1 is a vcredist for msvc2017.
+    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x86\\Minor") < 1)
         component.setValue("RequiresAdminRights", "true");
 }
 
@@ -40,7 +40,7 @@ Component.prototype.createOperations = function()
     // so that the simulator finds its fonts and applications find the simulator
     component.createOperations();
 
-    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\15.0\\VC\\Runtimes\\x86\\Installed") != 1) {
+    if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x86\\Minor") < 1) {
         // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
         // return value 5100 means there's a newer version of the runtime already installed
         component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_msvc2017_x86.exe", "/norestart", "/q");
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml
index 4d7306bff..ca9974501 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_msvc2017_x86/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>VCRedist for MSVC 2017 32bit</DisplayName>
     <Description>Visual C++ Redistributable Packages for Visual Studio 2017 32 bit</Description>
-    <Version>2019-02-13-0</Version>
+    <Version>2019-02-13-1</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Script>installscript.qs</Script>
     <Virtual>true</Virtual>