Qt Creator: Add dependency to vcredist MSVC2010 for OpenSSL

Our OpenSSL 1.1 prebuilt packages have a runtime dependency on MSVC2010

Change-Id: I8a6c0fbf463791f09a28700661ce10e8c16af1b1
Reviewed-by: David Schulz <david.schulz@qt.io>

5 files changed, 14 insertions, 4 deletions

diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64
index 263b4c669..12a97fecc 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x64
@@ -37,6 +37,8 @@ file_list:              qt-conf,
                         qtcreator-license-conf,
                         x64-tools-qtcreator-standalone-master-conf,
                         tools-qtcreatorcdbext-standalone-master-conf,
+                        x86-tools-vcredist_32-conf,
+                        x86_64-tools-vcredist_64-conf,
                         x86-tools-vcredist_msvc2017-conf,
                         x64-tools-vcredist_msvc2017-conf,
                         tools-windows-kits-debuggers-conf
diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86
index 92e05f842..4516e7818 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_master_x86
@@ -37,6 +37,8 @@ file_list:              qt-conf,
                         qtcreator-license-conf,
                         x86-tools-qtcreator-standalone-master-conf,
                         tools-qtcreatorcdbext-standalone-master-conf,
+                        x86-tools-vcredist_32-conf,
+                        x86_64-tools-vcredist_64-conf,
                         x86-tools-vcredist_msvc2017-conf,
                         x64-tools-vcredist_msvc2017-conf,
                         tools-windows-kits-debuggers-conf
diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64
index b56a4eea7..14a8cac7b 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64
@@ -37,6 +37,8 @@ file_list:              qt-conf,
                         qtcreator-license-conf,
                         x64-tools-qtcreator-standalone-conf,
                         tools-qtcreatorcdbext-standalone-conf,
+                        x86-tools-vcredist_32-conf,
+                        x86_64-tools-vcredist_64-conf,
                         x86-tools-vcredist_msvc2017-conf,
                         x64-tools-vcredist_msvc2017-conf
 
@@ -48,4 +50,3 @@ template_name:          config.xml.template.windows.qtcreator.x64
 
 [PackageTemplates]
 template_dirs:          pkg_qtcreator_standalone, pkg_tools
-
diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86
index e8e88b5e9..28568bfa1 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86
@@ -37,6 +37,8 @@ file_list:              qt-conf,
                         qtcreator-license-conf,
                         x86-tools-qtcreator-standalone-conf,
                         tools-qtcreatorcdbext-standalone-conf,
+                        x86-tools-vcredist_32-conf,
+                        x86_64-tools-vcredist_64-conf,
                         x86-tools-vcredist_msvc2017-conf,
                         x64-tools-vcredist_msvc2017-conf
 
@@ -48,4 +50,3 @@ template_name:          config.xml.template.windows.qtcreator
 
 [PackageTemplates]
 template_dirs:          pkg_qtcreator_standalone, pkg_tools
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.qtcreator/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.qtcreator/meta/installscript.qs
index 6e2eb1af9..a3d8cbbb7 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.qtcreator/meta/installscript.qs
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.qtcreator/meta/installscript.qs
@@ -54,8 +54,13 @@ function Component()
     if (installer.value("os") == "win") {
         // Creator needs vcredist 32bit on windows
         component.addDependency("qt.tools.vcredist_msvc%QTC_MSVC%_x86");
-        if (systemInfo.currentCpuArchitecture == "x86_64")
+        // for OpenSSL
+        component.addDependency("qt.tools.vcredist");
+        if (systemInfo.currentCpuArchitecture == "x86_64") {
             component.addDependency("qt.tools.vcredist_msvc%QTC_MSVC%_x64");
+            // for OpenSSL
+            component.addDependency("qt.tools.vcredist_64");
+        }
     }
 
     if (installer.value("os") == "x11") {
@@ -270,4 +275,3 @@ Component.prototype.installationFinished = function()
         print(e);
     }
 }
-