diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2014-07-01 14:13:58 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-07-07 14:38:01 +0200 |
| commit | 27390528bdc4474d808bf53fb2bbe33a5b1eaaef (patch) | |
| tree | 3804577a7243ce9e852ca7631e46fb37d43ab5d2 /tests | |
| parent | bce9c5db761eb04648341e5a61ad155bc1557c28 (diff) | |
Rename settings in config.xml file
Rename UninstallerName to MaintenanceToolName
(change its default value to "maintenancetool").
Rename UninstallerIniFile to MaintenanceToolIniFile.
Change-Id: Ic8ceae80b43c6793ae9b0baacea2ea374a0f90d1
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 4 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index 8af96edda..41e598760 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -25,8 +25,8 @@ File should contain all elements we allow in a config.xml <StartMenuDir>Super App</StartMenuDir> - <UninstallerName>uninstaller</UninstallerName> - <UninstallerIniFile>uninstaller.ini</UninstallerIniFile> + <MaintenanceToolName>maintenancetool</MaintenanceToolName> + <MaintenanceToolIniFile>maintenancetool.ini</MaintenanceToolIniFile> <RemoveTargetDir>true</RemoveTargetDir> <RunProgram>myapp</RunProgram> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 2bd318f52..7f75c74b2 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -58,8 +58,8 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.runProgramDescription(), QString()); QCOMPARE(settings.adminTargetDir(), QString()); QCOMPARE(settings.removeTargetDir(), QLatin1String("true")); - QCOMPARE(settings.uninstallerName(), QLatin1String("uninstall")); - QCOMPARE(settings.uninstallerIniFile(), QLatin1String("uninstall.ini")); + QCOMPARE(settings.maintenanceToolName(), QLatin1String("maintenancetool")); + QCOMPARE(settings.maintenanceToolIniFile(), QLatin1String("maintenancetool.ini")); QCOMPARE(settings.configurationFileName(), QLatin1String("components.xml")); QCOMPARE(settings.dependsOnLocalInstallerBinary(), false); QCOMPARE(settings.repositorySettingsPageVisible(), true); |