diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2012-07-06 08:47:37 +0300 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-06 09:23:23 +0200 |
| commit | 2abc9ee32365d7943ca8626d11710dd643436fa1 (patch) | |
| tree | 774c42ff7694cb0edc60e6e69e4ec7dcd99c8bbd /release-tools | |
| parent | 7e37e49d4927d1caaba4a163f49e860a2d15684b (diff) | |
Change vcredistributable configurations to be user selectable
Make vcredistributable components visible and user selectable.
Also do not use silent install option for them.
Change-Id: Icb83221fb227fc72645899ef7001332d67128955
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'release-tools')
6 files changed, 6 insertions, 6 deletions
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml index 216f7e3..33d806a 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010/meta/package.xml @@ -5,7 +5,7 @@ <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.msvc2010</Name> - <Dependencies>qt.sdk.misc.vcredist_x86</Dependencies> + <!--<Dependencies>qt.sdk.misc.vcredist_x86</Dependencies>--> <Default>%PACKAGE_DEFAULT_TAG%</Default> <!--<AutoSelectOn></AutoSelectOn>--> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml index 8b49eb3..94d7dfc 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2010_64/meta/package.xml @@ -5,7 +5,7 @@ <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.msvc2010_64</Name> - <Dependencies>qt.sdk.misc.vcredist_x64</Dependencies> + <!--<Dependencies>qt.sdk.misc.vcredist_x64</Dependencies>--> <Default>%PACKAGE_DEFAULT_TAG%</Default> <!--<AutoSelectOn></AutoSelectOn>--> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs index 2cd4ad3..5f638aa 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/installscript.qs @@ -16,5 +16,5 @@ Component.prototype.createOperations = function() component.createOperations(); //return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application - component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x64.exe", "/q"); + component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x64.exe", "/norestart"); } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml index 7325c5e..4cc0103 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x64/meta/package.xml @@ -6,7 +6,7 @@ <Name>qt.sdk.misc.vcredist_x64</Name> <ReleaseDate>2010-12-04</ReleaseDate> <Script>installscript.qs</Script> - <Virtual>true</Virtual> + <!--<Virtual>true</Virtual>--> <!--<ForcedInstallation>true</ForcedInstallation>--> <RequiresAdminRights>true</RequiresAdminRights> <Default>%PACKAGE_DEFAULT_TAG%</Default> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs index ada2bf4..66ab1ee 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/installscript.qs @@ -16,5 +16,5 @@ Component.prototype.createOperations = function() component.createOperations(); //return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application - component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x86.exe", "/q"); + component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\vcredist\\vcredist_x86.exe", "/norestart"); } diff --git a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml index 84ded56..02181cf 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.misc.vcredist_x86/meta/package.xml @@ -6,7 +6,7 @@ <Name>qt.sdk.misc.vcredist_x86</Name> <ReleaseDate>2010-12-04</ReleaseDate> <Script>installscript.qs</Script> - <Virtual>true</Virtual> + <!--<Virtual>true</Virtual>--> <!--<ForcedInstallation>true</ForcedInstallation>--> <RequiresAdminRights>true</RequiresAdminRights> <Default>%PACKAGE_DEFAULT_TAG%</Default> |