diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:03:13 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:14:50 +0100 |
| commit | 711c579ffa053acfe49879960bfb1b1b1b5f4c8b (patch) | |
| tree | db9036908d52db1dedf74fe5dd07a9132d7c547d /dist/config | |
| parent | 515b96469d39c8dfd5ba823ecac371414c02e552 (diff) | |
| parent | 7b584f55c2fee55aabd852aa836d6d8295ee1b22 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
Diffstat (limited to 'dist/config')
| -rw-r--r-- | dist/config/config.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/config/config.xml b/dist/config/config.xml index d643c79b8..39ee262bc 100644 --- a/dist/config/config.xml +++ b/dist/config/config.xml @@ -6,7 +6,7 @@ <Publisher>Qt Project</Publisher> <ProductUrl>http://qt-project.org</ProductUrl> <Watermark>watermark.png</Watermark> - <UninstallerName>Uninstaller</UninstallerName> + <MaintenanceToolName>Uninstaller</MaintenanceToolName> <!-- Tweaked for windows in installscript.qs --> <TargetDir>@HomeDir@/Qt/QtIFW-2.0.81</TargetDir> |