diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-07-20 13:34:44 +1000 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@digia.com> | 2012-07-30 06:24:15 +0200 |
commit | f7bb2c90b4f4695f0409c86f319d10eabb0fb277 (patch) | |
tree | c82912330f019ff07101ead4ecf5810256c4e8fe | |
parent | 243eb9173e09726c2073de1835e71c95740f141e (diff) |
Consistently label the first Qt 5 beta as "Beta 1".
Change-Id: I1f090279c710f37d0b711ddea978676ae95947b0
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
21 files changed, 50 insertions, 50 deletions
diff --git a/release-tools/configurations/linux/config.xml.template.linux.qt5-beta b/release-tools/configurations/linux/config.xml.template.linux.qt5-beta index bd7a361..84e9d34 100644 --- a/release-tools/configurations/linux/config.xml.template.linux.qt5-beta +++ b/release-tools/configurations/linux/config.xml.template.linux.qt5-beta @@ -1,16 +1,16 @@ <?xml version="1.0"?> <Installer> - <Name>Qt 5.0.0 Beta Installer</Name> + <Name>Qt 5.0.0 Beta 1 Installer</Name> <Version>%SDK_VERSION_NUM%</Version> - <Title>Qt 5.0.0 Beta</Title> - <MaintenanceTitle>Maintain Qt 5.0.0 Beta</MaintenanceTitle> + <Title>Qt 5.0.0 Beta 1</Title> + <MaintenanceTitle>Maintain Qt 5.0.0 Beta 1</MaintenanceTitle> <Publisher>Qt</Publisher> <Logo>logo.png</Logo> <LogoSmall>logo-small.png</LogoSmall> <Icon>logo-small</Icon> <License>license.txt</License> <Watermark>watermark.png</Watermark> - <StartMenuDir>Qt 5.0.0 Beta</StartMenuDir> + <StartMenuDir>Qt 5.0.0 Beta 1</StartMenuDir> <ProductUrl>qt.nokia.com</ProductUrl> <!--<Background>background.png</Background>--> <UninstallerName>MaintenanceTool</UninstallerName> @@ -21,6 +21,6 @@ </Repository> </RemoteRepositories>--> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> - <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir> - <AdminTargetDir>/opt/Qt5.0.0beta</AdminTargetDir> + <TargetDir>@homeDir@/Qt5.0.0beta1</TargetDir> + <AdminTargetDir>/opt/Qt5.0.0beta1</AdminTargetDir> </Installer> diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta index 16d9078..d605447 100644 --- a/release-tools/configurations/linux_x86_32_beta +++ b/release-tools/configurations/linux_x86_32_beta @@ -62,7 +62,7 @@ archive_name: readme.7z [qt.sdk.src.qt.500_beta] archives: src.qt.500_beta -target_install_base: /Src/Qt/5.0.0-beta/ +target_install_base: /Src/Qt/5.0.0-beta1/ version: 5.0.0 version_tag: %QT_VERSION% package_default: true @@ -77,7 +77,7 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop.500_beta.gcc] archives: desktop.500_beta.gcc -target_install_base: /Desktop/Qt/5.0.0-beta/gcc +target_install_base: /Desktop/Qt/5.0.0-beta1/gcc version: 5.0.0 version_tag: %QT_VERSION% package_default: true diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta index c2c0a1e..dabbcb8 100644 --- a/release-tools/configurations/linux_x86_64_beta +++ b/release-tools/configurations/linux_x86_64_beta @@ -61,7 +61,7 @@ archive_name: readme.7z [qt.sdk.src.qt.500_beta] archives: src.qt.500_beta -target_install_base: /Src/Qt/5.0.0-beta/ +target_install_base: /Src/Qt/5.0.0-beta1/ version: 5.0.0 version_tag: %QT_VERSION% package_default: true @@ -76,7 +76,7 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop.500_beta.gcc_64] archives: desktop.500_beta.gcc_64 -target_install_base: /Desktop/Qt/5.0.0-beta/gcc_64 +target_install_base: /Desktop/Qt/5.0.0-beta1/gcc_64 version: 5.0.0 version_tag: %QT_VERSION% package_default: true diff --git a/release-tools/configurations/mac/config.xml.template.mac.qt5-beta b/release-tools/configurations/mac/config.xml.template.mac.qt5-beta index 9ac5fc5..98ad6fa 100644 --- a/release-tools/configurations/mac/config.xml.template.mac.qt5-beta +++ b/release-tools/configurations/mac/config.xml.template.mac.qt5-beta @@ -1,16 +1,16 @@ <?xml version="1.0"?> <Installer> - <Name>Qt 5.0.0 Beta Installer</Name> + <Name>Qt 5.0.0 Beta 1 Installer</Name> <Version>%SDK_VERSION_NUM%</Version> - <Title>Qt 5.0.0 Beta</Title> - <MaintenanceTitle>Maintain Qt 5.0.0 Beta</MaintenanceTitle> + <Title>Qt 5.0.0 Beta 1</Title> + <MaintenanceTitle>Maintain Qt 5.0.0 Beta 1</MaintenanceTitle> <Publisher>Qt</Publisher> <Logo>logo.png</Logo> <LogoSmall>logo-small.png</LogoSmall> <Icon>logo-small</Icon> <License>license.txt</License> <Watermark>watermark.png</Watermark> - <StartMenuDir>Qt 5.0.0 Beta</StartMenuDir> + <StartMenuDir>Qt 5.0.0 Beta 1</StartMenuDir> <ProductUrl>qt.nokia.com</ProductUrl> <!--<Background>background.png</Background>--> <UninstallerName>MaintenanceTool</UninstallerName> @@ -21,5 +21,5 @@ </Repository> </RemoteRepositories>--> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> - <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir> + <TargetDir>@homeDir@/Qt5.0.0beta1</TargetDir> </Installer> diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta index bbe3b77..68900df 100644 --- a/release-tools/configurations/mac_x86_64_beta +++ b/release-tools/configurations/mac_x86_64_beta @@ -66,7 +66,7 @@ archive_name: readme.7z [qt.sdk.src.qt.500_beta] archives: src.qt.500_beta -target_install_base: /Src/Qt/5.0.0-beta/ +target_install_base: /Src/Qt/5.0.0-beta1/ version: 5.0.0 version_tag: %QT_VERSION% package_default: true @@ -81,7 +81,7 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop.500_beta.gcc_64] archives: desktop.500_beta.gcc_64 -target_install_base: /Desktop/Qt/5.0.0-beta/gcc_64 +target_install_base: /Desktop/Qt/5.0.0-beta1/gcc_64 version: 5.0.0 version_tag: %QT_VERSION% package_default: true diff --git a/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml index 186c649..4b982b1 100644 --- a/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml +++ b/release-tools/configurations/pkg/com.qt.desktop.qt/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5 Beta Desktop Qt Components</DisplayName> - <Description>Desktop Qt 5 Beta Components</Description> + <DisplayName>Qt 5 Beta 1 Desktop Qt Components</DisplayName> + <Description>Desktop Qt 5 Beta 1 Components</Description> <Version>%SDK_VERSION_NUM%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>com.qt.desktop.qt</Name> diff --git a/release-tools/configurations/pkg/com.qt/meta/package.xml b/release-tools/configurations/pkg/com.qt/meta/package.xml index cad836f..0ed5702 100644 --- a/release-tools/configurations/pkg/com.qt/meta/package.xml +++ b/release-tools/configurations/pkg/com.qt/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5 Beta Installer</DisplayName> - <Description>Qt 5 Beta Installer</Description> + <DisplayName>Qt 5 Beta 1 Installer</DisplayName> + <Description>Qt 5 Beta 1 Installer</Description> <Version>%SDK_VERSION_NUM%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>com.qt</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml index 8fdbc15..46f014b 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (gcc)</DisplayName> - <Description>Qt 5.0.0 Beta (gcc)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (gcc)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (gcc)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.gcc</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml index aa962d4..db59a9a 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.gcc_64/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (gcc 64-bit)</DisplayName> - <Description>Qt 5.0.0 Beta (gcc 64-bit)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (gcc 64-bit)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (gcc 64-bit)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.gcc_64</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml index 00231c7..b9dade9 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.mingw/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (mingw)</DisplayName> - <Description>Qt 5.0.0 Beta (mingw)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (mingw)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (mingw)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.mingw</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml index f80d849..e5c2033 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop.500_beta.msvc2008/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (msvc2008)</DisplayName> - <Description>Qt 5.0.0 Beta (msvc2008)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (msvc2008)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (msvc2008)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.msvc2008</Name> 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 33d806a..9dff43e 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 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (msvc2010 32-bit)</DisplayName> - <Description>Qt 5.0.0 Beta (msvc2010 32-bit)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (msvc2010 32-bit)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (msvc2010 32-bit)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.msvc2010</Name> 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 94d7dfc..09f93ce 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 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta (msvc2010 64-bit)</DisplayName> - <Description>Qt 5.0.0 Beta (msvc2010 64-bit)</Description> + <DisplayName>Qt 5.0.0 Beta 1 (msvc2010 64-bit)</DisplayName> + <Description>Qt 5.0.0 Beta 1 (msvc2010 64-bit)</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop.500_beta.msvc2010_64</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml index 0b12f53..ab24f77 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.desktop/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>Desktop Components</DisplayName> - <Description>Qt 5 Beta Desktop Components</Description> + <Description>Qt 5.0.0 Beta 1 Desktop Components</Description> <Version>1.0.0</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.desktop</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml index 7e00982..521eecb 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta Readme</DisplayName> - <Description>Qt 5.0.0 Beta Readme</Description> + <DisplayName>Qt 5.0.0 Beta 1 Readme</DisplayName> + <Description>Qt 5.0.0 Beta 1 Readme</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.readme</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui index 8824349..341f4e8 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui +++ b/release-tools/configurations/pkg_beta/qt.sdk.readme/meta/readmecheckboxform.ui @@ -17,7 +17,7 @@ <item> <widget class="QCheckBox" name="readMeCheckBox"> <property name="text"> - <string>Open Qt 5.0.0 beta ReadMe</string> + <string>Open Qt 5.0.0 Beta 1 ReadMe</string> </property> <property name="checked"> <bool>true</bool> diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml index a285132..28a8ab2 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5.0.0 Beta Source Package</DisplayName> - <Description>Qt 5.0.0 Beta Source Package</Description> + <DisplayName>Qt 5.0.0 Beta 1 Source Package</DisplayName> + <Description>Qt 5.0.0 Beta 1 Source Package</Description> <Version>%QT_VERSION%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk.src.qt.500_beta</Name> diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs b/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs index b56c0d7..eeb9947 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs +++ b/release-tools/configurations/pkg_beta/qt.sdk/meta/installscript.qs @@ -22,7 +22,7 @@ Component.prototype.createOperations = function() component.addOperation( "CreateShortcut", win_application, - "@StartMenuDir@/Uninstall Qt 5.0.0 Beta.lnk", + "@StartMenuDir@/Uninstall Qt 5.0.0 Beta 1.lnk", " --uninstall"); } catch( e ) { print( e ); diff --git a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml index 4a6e089..0e317e2 100644 --- a/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml +++ b/release-tools/configurations/pkg_beta/qt.sdk/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt 5 Beta</DisplayName> - <Description>Qt 5 Beta Installer</Description> + <DisplayName>Qt 5.0.0 Beta 1</DisplayName> + <Description>Qt 5.0.0 Beta 1 Installer</Description> <Version>1.0.0</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Name>qt.sdk</Name> diff --git a/release-tools/configurations/win_x86_beta b/release-tools/configurations/win_x86_beta index 7b8cc4e..1b9175b 100644 --- a/release-tools/configurations/win_x86_beta +++ b/release-tools/configurations/win_x86_beta @@ -69,7 +69,7 @@ archive_name: qt-project-url.7z [qt.sdk.src.qt.500_beta] archives: src.qt.500_beta -target_install_base: /Src/Qt/5.0.0-beta/ +target_install_base: /Src/Qt/5.0.0-beta1/ version: 5.0.0 version_tag: %QT_VERSION% package_default: true @@ -84,7 +84,7 @@ archive_name: qt-everywhere-opensource-src-5.0.0.7z [qt.sdk.desktop.500_beta.msvc2010_64] archives: desktop.500_beta.msvc2010_64, icu_49.win_64 -target_install_base: /Desktop/Qt/5.0.0-beta/msvc2010_64 +target_install_base: /Desktop/Qt/5.0.0-beta1/msvc2010_64 version: 5.0.0 version_tag: %QT_VERSION% package_default: true @@ -103,7 +103,7 @@ archive_name: icu_49_win_64.7z [qt.sdk.desktop.500_beta.msvc2010] archives: desktop.500_beta.msvc2010, icu_49.win_32 -target_install_base: /Desktop/Qt/5.0.0-beta/msvc2010 +target_install_base: /Desktop/Qt/5.0.0-beta1/msvc2010 version: 5.0.0 version_tag: %QT_VERSION% package_default: true diff --git a/release-tools/configurations/windows/config.xml.template.windows.qt5-beta b/release-tools/configurations/windows/config.xml.template.windows.qt5-beta index 9ac5fc5..98ad6fa 100644 --- a/release-tools/configurations/windows/config.xml.template.windows.qt5-beta +++ b/release-tools/configurations/windows/config.xml.template.windows.qt5-beta @@ -1,16 +1,16 @@ <?xml version="1.0"?> <Installer> - <Name>Qt 5.0.0 Beta Installer</Name> + <Name>Qt 5.0.0 Beta 1 Installer</Name> <Version>%SDK_VERSION_NUM%</Version> - <Title>Qt 5.0.0 Beta</Title> - <MaintenanceTitle>Maintain Qt 5.0.0 Beta</MaintenanceTitle> + <Title>Qt 5.0.0 Beta 1</Title> + <MaintenanceTitle>Maintain Qt 5.0.0 Beta 1</MaintenanceTitle> <Publisher>Qt</Publisher> <Logo>logo.png</Logo> <LogoSmall>logo-small.png</LogoSmall> <Icon>logo-small</Icon> <License>license.txt</License> <Watermark>watermark.png</Watermark> - <StartMenuDir>Qt 5.0.0 Beta</StartMenuDir> + <StartMenuDir>Qt 5.0.0 Beta 1</StartMenuDir> <ProductUrl>qt.nokia.com</ProductUrl> <!--<Background>background.png</Background>--> <UninstallerName>MaintenanceTool</UninstallerName> @@ -21,5 +21,5 @@ </Repository> </RemoteRepositories>--> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> - <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir> + <TargetDir>@homeDir@/Qt5.0.0beta1</TargetDir> </Installer> |