diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 15:48:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-10 09:11:47 +0200 |
| commit | f3d30dfba177ec7e165f0d9ced3587ed16ed605c (patch) | |
| tree | 8faa77416b594c1855d4024bb48341df420dd908 /dist | |
| parent | d2a07dfa0dd585869db63f3b1ed3f6ef93ac61d2 (diff) | |
| download | qt-creator-f3d30dfba177ec7e165f0d9ced3587ed16ed605c.tar.gz | |
Fix installation directory and add version to title.
Task-number: QTCREATORBUG-7991
Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/ifw/config/config-linux.xml.in | 24 | ||||
| -rw-r--r-- | dist/installer/ifw/config/config-windows.xml.in (renamed from dist/installer/ifw/config/config.xml.in) | 5 |
2 files changed, 26 insertions, 3 deletions
diff --git a/dist/installer/ifw/config/config-linux.xml.in b/dist/installer/ifw/config/config-linux.xml.in new file mode 100644 index 0000000000..4bc8a0c539 --- /dev/null +++ b/dist/installer/ifw/config/config-linux.xml.in @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<Installer> + <Name>Qt Creator</Name> + <Version>{version}</Version> + <Title>Qt Creator {version}</Title> + <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle> + <Publisher>Qt Project</Publisher> + <ProductUrl>http://qt-project.org</ProductUrl> + + <Icon>logo.png</Icon> + <Watermark>watermark.png</Watermark> + <UninstallerName>QtCreatorUninstaller</UninstallerName> + <!-- @homeDir@ and @rootDir@ are some of the supported vars --> + <TargetDir>@homeDir@/qtcreator-{version}</TargetDir> + <AdminTargetDir>/opt/qtcreator-{version}</AdminTargetDir> + + <Pages> + <Page name="LicenseAgreementPage"> + <AcceptLicenseLabel>I have read and understood the terms contained in the above license agreements.</AcceptLicenseLabel> + <RejectLicenseLabel>I do not accept the terms contained in the above license agreements.</RejectLicenseLabel> + </Page> + </Pages> + +</Installer> diff --git a/dist/installer/ifw/config/config.xml.in b/dist/installer/ifw/config/config-windows.xml.in index 39fe7f4f00..df82b33873 100644 --- a/dist/installer/ifw/config/config.xml.in +++ b/dist/installer/ifw/config/config-windows.xml.in @@ -2,7 +2,7 @@ <Installer> <Name>Qt Creator</Name> <Version>{version}</Version> - <Title>Qt Creator</Title> + <Title>Qt Creator {version}</Title> <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle> <Publisher>Qt Project</Publisher> <ProductUrl>http://qt-project.org</ProductUrl> @@ -11,8 +11,7 @@ <Watermark>watermark.png</Watermark> <UninstallerName>QtCreatorUninstaller</UninstallerName> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> - <TargetDir>@homeDir@/QtCreator</TargetDir> - <AdminTargetDir>/opt/QtCreator</AdminTargetDir> + <TargetDir>@rootDir@/QtCreator/qtcreator-{version}</TargetDir> <Pages> <Page name="LicenseAgreementPage"> |