diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-02-19 10:14:46 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-02-22 06:33:55 +0000 |
| commit | 3a7ba7cec4429fe54dca282be926eef2b0cdc4c2 (patch) | |
| tree | 75a82d10bd2fed5523d1608a76c34c0ca37cfe11 | |
| parent | 43f20d079ad8cd1a767b3d5dca56ea4d9c3d33cd (diff) | |
Qt5.6: Update online installer default package setupv5.6.0-rc1-packaging
Add missing WinRT/WinPhone targets.
Always show all WinRT/WinPhone targets, do not hide them based on the
host os version.
Change-Id: Ie493dce7c2ae4d29286001e38c43ac32e7f4a817
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_56/qt.56/meta/installscript.qs | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_56/qt.56/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_56/qt.56/meta/installscript.qs index 967c1a970..c7786ccb4 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_56/qt.56/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_56/qt.56/meta/installscript.qs @@ -44,7 +44,12 @@ function Component() var android_armv7 = installer.componentByName("qt.56.android_armv7"); var winphone_arm = installer.componentByName("qt.56.win64_msvc2013_winphone_arm"); var winphone_x86 = installer.componentByName("qt.56.win64_msvc2013_winphone_x86"); - var winrt_x64 = installer.componentByName("qt.56.win64_msvc2013_winrt_x64"); + var msvc2013_winphone_arm = installer.componentByName("qt.56.win64_msvc2013_winphone_arm"); + var msvc2013_winphone_x86 = installer.componentByName("qt.56.win64_msvc2013_winphone_x86"); + var msvc2013_winrt_x64 = installer.componentByName("qt.56.win64_msvc2013_winrt_x64"); + var msvc2015_winrt_armv7 = installer.componentByName("qt.56.win64_msvc2015_winrt_armv7"); + var msvc2015_winrt_x64 = installer.componentByName("qt.56.win64_msvc2015_winrt_x64"); + var msvc2015_winrt_x86 = installer.componentByName("qt.56.win64_msvc2015_winrt_x86"); // first reset the latest Qt5.x.x package default values to false installer.componentByName("qt.56.win32_mingw49").setValue("Default", "false"); @@ -61,20 +66,23 @@ function Component() winphone_arm.setValue("Default", "false"); if (winphone_x86) winphone_x86.setValue("Default", "false"); - if (winrt_x64) - winrt_x64.setValue("Default", "false"); + if (msvc2013_winphone_arm) + msvc2013_winphone_arm.setValue("Default", "false"); + if (msvc2013_winphone_x86) + msvc2013_winphone_x86.setValue("Default", "false"); + if (msvc2013_winrt_x64) + msvc2013_winrt_x64.setValue("Default", "false"); + if (msvc2015_winrt_armv7) + msvc2015_winrt_armv7.setValue("Default", "false"); + if (msvc2015_winrt_x64) + msvc2015_winrt_x64.setValue("Default", "false"); + if (msvc2015_winrt_x86) + msvc2015_winrt_x86.setValue("Default", "false"); // if 32bit windows hide the 64bit packages if (installer.environmentVariable("ProgramFiles(x86)") == "" ) { installer.componentByName("qt.56.win64_msvc2013_64").setValue("Virtual", "true"); installer.componentByName("qt.56.win64_msvc2015_64").setValue("Virtual", "true"); - - if (winphone_arm) - winphone_arm.setValue("Virtual", "true"); - if (winphone_x86) - winphone_x86.setValue("Virtual", "true"); - if (winrt_x64) - winrt_x64.setValue("Virtual", "true"); } // now try to determine which tool chains to select by default |