Fine tune Qt 5 Beta installer configurations.

Some fine tuning into Qt5 Beta installer configurations. Updated
component description texts and removed unnecessary item from
install tree.

Change-Id: I71a5121cb99b66353dda00064835dc9e4d4e2901
Reviewed-by: Simo Fält <simo.falt@nokia.com>

21 files changed, 52 insertions, 68 deletions

diff --git a/release-tools/configurations/all-os/common b/release-tools/configurations/all-os/common
index c9cff3d..9dcfd32 100644
--- a/release-tools/configurations/all-os/common
+++ b/release-tools/configurations/all-os/common
@@ -1,5 +1,5 @@
 [SdkCommon]
-version:                            1.0.0
-name:                               Qt5-Installer
+version:                            5.0.0-beta
+name:                               Qt-Installer
 
 
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 a81970d..bd7a361 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>Qt5 Beta Installer</Name>
+    <Name>Qt 5.0.0 Beta Installer</Name>
     <Version>%SDK_VERSION_NUM%</Version>
-    <Title>Qt5 Beta Installer</Title>
-    <MaintenanceTitle>Maintain Qt5 Beta</MaintenanceTitle>
+    <Title>Qt 5.0.0 Beta</Title>
+    <MaintenanceTitle>Maintain Qt 5.0.0 Beta</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>Qt5 Beta</StartMenuDir>
+    <StartMenuDir>Qt 5.0.0 Beta</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>/opt/Qt5-beta</TargetDir>
-    <AdminTargetDir>/opt/Qt5-beta</AdminTargetDir>
+    <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir>
+    <AdminTargetDir>/opt/Qt5.0.0beta</AdminTargetDir>
 </Installer>
diff --git a/release-tools/configurations/linux_x86_32_beta b/release-tools/configurations/linux_x86_32_beta
index 7ebefc4..a089661 100644
--- a/release-tools/configurations/linux_x86_32_beta
+++ b/release-tools/configurations/linux_x86_32_beta
@@ -62,10 +62,6 @@ archive_name:           qt-everywhere-opensource-src-5.0.0.7z
 
 [qt.sdk.desktop]
 
-[qt.sdk.desktop.500_beta]
-version:                5.0.0
-version_tag:            %QT_VERSION%
-
 [qt.sdk.desktop.500_beta.gcc]
 archives:               desktop.500_beta.gcc
 target_install_base:    /Desktop/Qt/5.0.0-beta/gcc
diff --git a/release-tools/configurations/linux_x86_64_beta b/release-tools/configurations/linux_x86_64_beta
index 945bd1a..b6fc3e2 100644
--- a/release-tools/configurations/linux_x86_64_beta
+++ b/release-tools/configurations/linux_x86_64_beta
@@ -61,10 +61,6 @@ archive_name:           qt-everywhere-opensource-src-5.0.0.7z
 
 [qt.sdk.desktop]
 
-[qt.sdk.desktop.500_beta]
-version:                5.0.0
-version_tag:            %QT_VERSION%
-
 [qt.sdk.desktop.500_beta.gcc_64]
 archives:               desktop.500_beta.gcc_64
 target_install_base:    /Desktop/Qt/5.0.0-beta/gcc_64
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 775bb71..9ac5fc5 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>Qt5 Beta Installer</Name>
+    <Name>Qt 5.0.0 Beta Installer</Name>
     <Version>%SDK_VERSION_NUM%</Version>
-    <Title>Qt5 Beta Installer</Title>
-    <MaintenanceTitle>Maintain Qt5 Beta</MaintenanceTitle>
+    <Title>Qt 5.0.0 Beta</Title>
+    <MaintenanceTitle>Maintain Qt 5.0.0 Beta</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>Qt5 Beta</StartMenuDir>
+    <StartMenuDir>Qt 5.0.0 Beta</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>/opt/Qt5-beta</TargetDir>
+    <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir>
 </Installer>
diff --git a/release-tools/configurations/mac_x86_64_beta b/release-tools/configurations/mac_x86_64_beta
index 51eb229..f85dbba 100644
--- a/release-tools/configurations/mac_x86_64_beta
+++ b/release-tools/configurations/mac_x86_64_beta
@@ -66,10 +66,6 @@ archive_name:           qt-everywhere-opensource-src-5.0.0.7z
 
 [qt.sdk.desktop]
 
-[qt.sdk.desktop.500_beta]
-version:                5.0.0
-version_tag:            %QT_VERSION%
-
 [qt.sdk.desktop.500_beta.gcc_64]
 archives:               desktop.500_beta.gcc_64
 target_install_base:    /Desktop/Qt/5.0.0-beta/gcc_64
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 e1d9feb..186c649 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 Desktop Qt Components</DisplayName>
-    <Description>Qt Desktop Qt Components</Description>
+    <DisplayName>Qt 5 Beta Desktop Qt Components</DisplayName>
+    <Description>Desktop Qt 5 Beta 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.desktop/meta/package.xml b/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml
index 9e9b762..79c067b 100644
--- a/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml
+++ b/release-tools/configurations/pkg/com.qt.desktop/meta/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt Desktop Components</DisplayName>
-    <Description>Qt Desktop Components</Description>
+    <DisplayName>Desktop Components</DisplayName>
+    <Description>Desktop Components</Description>
     <Version>%SDK_VERSION_NUM%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>com.qt.desktop</Name>
diff --git a/release-tools/configurations/pkg/com.qt/meta/package.xml b/release-tools/configurations/pkg/com.qt/meta/package.xml
index a2c44e3..cad836f 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 Installer</DisplayName>
-    <Description>Qt Installer5</Description>
+    <DisplayName>Qt 5 Beta Installer</DisplayName>
+    <Description>Qt 5 Beta 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 d1241c8..8fdbc15 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (gcc)</DisplayName>
-    <Description>Qt %QT_VERSION% (gcc)</Description>
+    <DisplayName>Qt 5.0.0 Beta (gcc)</DisplayName>
+    <Description>Qt 5.0.0 Beta (gcc)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Name>qt.sdk.desktop.500_beta_gcc</Name>
+    <Name>qt.sdk.desktop.500_beta.gcc</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 5599a9d..aa962d4 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (gcc 64-bit)</DisplayName>
-    <Description>Qt %QT_VERSION% (gcc 64-bit)</Description>
+    <DisplayName>Qt 5.0.0 Beta (gcc 64-bit)</DisplayName>
+    <Description>Qt 5.0.0 Beta (gcc 64-bit)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.gcc_64</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 1493686..00231c7 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (mingw)</DisplayName>
-    <Description>Qt %QT_VERSION% (mingw)</Description>
+    <DisplayName>Qt 5.0.0 Beta (mingw)</DisplayName>
+    <Description>Qt 5.0.0 Beta (mingw)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.mingw</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 c1d1648..f80d849 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (msvc2008)</DisplayName>
-    <Description>Qt %QT_VERSION% (msvc2008)</Description>
+    <DisplayName>Qt 5.0.0 Beta (msvc2008)</DisplayName>
+    <Description>Qt 5.0.0 Beta (msvc2008)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.msvc2008</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 ef6303e..789ab31 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (msvc2010 32-bit)</DisplayName>
-    <Description>Qt %QT_VERSION% (msvc2010 32-bit)</Description>
+    <DisplayName>Qt 5.0.0 Beta (msvc2010 32-bit)</DisplayName>
+    <Description>Qt 5.0.0 Beta (msvc2010 32-bit)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.msvc2010</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 c874642..952676a 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% (msvc2010 64-bit)</DisplayName>
-    <Description>Qt %QT_VERSION% (msvc2010 64-bit)</Description>
+    <DisplayName>Qt 5.0.0 Beta (msvc2010 64-bit)</DisplayName>
+    <Description>Qt 5.0.0 Beta (msvc2010 64-bit)</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.desktop.500_beta.msvc2010_64</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <Script>installscript.qs</Script>   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
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 f50be75..0b12f53 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>Qt5 Desktop Components</DisplayName>
-    <Description>Qt5 Desktop Components</Description>
+    <DisplayName>Desktop Components</DisplayName>
+    <Description>Qt 5 Beta 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.src.qt.500_beta/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.src.qt.500_beta/meta/package.xml
index 78d8816..a285132 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,12 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt %QT_VERSION% Source Package</DisplayName>
-    <Description>Qt %QT_VERSION% Source Package</Description>
+    <DisplayName>Qt 5.0.0 Beta Source Package</DisplayName>
+    <Description>Qt 5.0.0 Beta Source Package</Description>
     <Version>%QT_VERSION%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.src.qt.500_beta</Name>
     <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional -->
-    <!--<Default></Default>-->
+    <Default>%PACKAGE_DEFAULT_TAG%</Default>
     <!--<AutoSelectOn></AutoSelectOn>-->
     <!--<Script>installscript.qs</Script>-->   <!-- File name of a script being loaded - optional. -->
     <!--<Forced></Forced>-->
diff --git a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml b/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml
index da5ba44..9444bf2 100644
--- a/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml
+++ b/release-tools/configurations/pkg_beta/qt.sdk.src/meta/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>Qt Source Components</DisplayName>
-    <Description>Qt Source Components</Description>
+    <DisplayName>Source Components</DisplayName>
+    <Description>Source Components</Description>
     <Version>1.0.0</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Name>qt.sdk.src</Name>
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 9532283..4a6e089 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>Qt5</DisplayName>
-    <Description>Qt5 Installer</Description>
+    <DisplayName>Qt 5 Beta</DisplayName>
+    <Description>Qt 5 Beta 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 9126d58..0eb2650 100644
--- a/release-tools/configurations/win_x86_beta
+++ b/release-tools/configurations/win_x86_beta
@@ -63,10 +63,6 @@ archive_name:           qt-everywhere-opensource-src-5.0.0.7z
 
 [qt.sdk.desktop]
 
-[qt.sdk.desktop.500_beta]
-version:                5.0.0
-version_tag:            %QT_VERSION%
-
 [qt.sdk.desktop.500_beta.msvc2010_64]
 archives:               desktop.500_beta.msvc2010_64
 target_install_base:    /Desktop/Qt/5.0.0-beta/msvc2010_64
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 00802c7..9ac5fc5 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>Qt5 Beta Installer</Name>
+    <Name>Qt 5.0.0 Beta Installer</Name>
     <Version>%SDK_VERSION_NUM%</Version>
-    <Title>Qt5 Beta Installer</Title>
-    <MaintenanceTitle>Maintain Qt5 Beta</MaintenanceTitle>
+    <Title>Qt 5.0.0 Beta</Title>
+    <MaintenanceTitle>Maintain Qt 5.0.0 Beta</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>Qt5 Beta</StartMenuDir>
+    <StartMenuDir>Qt 5.0.0 Beta</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>@rootDir@/Qt/5.0.0-beta</TargetDir>
+    <TargetDir>@homeDir@/Qt5.0.0beta</TargetDir>
 </Installer>