diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-09-05 11:14:31 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-09-05 14:18:31 +0200 |
| commit | 858d39554cc2709213d4b403637dd38e0e172a34 (patch) | |
| tree | 020574f2e5e1606b4af310de643d61891c940dc6 /src/libs/installer | |
| parent | 4883046795fca3c26e19cbc7c0a884e922d128e7 (diff) | |
Set value for empty tags that should provide a default value.
Task-number: QTIFW-541
Change-Id: Ib899d87be75baaa96b3b15d8a94f660c1a6544e0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/settings.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 80ffc70e7..401b173b2 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -281,17 +281,20 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, s.d->m_data.insert(scIcon, QLatin1String(":/installer")); if (!s.d->m_data.contains(scInstallerApplicationIcon)) s.d->m_data.insert(scInstallerApplicationIcon, s.d->m_data.value(scIcon)); - if (!s.d->m_data.contains(scInstallerWindowIcon)) + if (!s.d->m_data.contains(scInstallerWindowIcon)) { s.d->m_data.insert(scInstallerWindowIcon, QString(s.d->m_data.value(scIcon).toString() + s.systemIconSuffix())); + } if (!s.d->m_data.contains(scRemoveTargetDir)) s.d->m_data.insert(scRemoveTargetDir, scTrue); - if (!s.d->m_data.contains(scMaintenanceToolName)) + if (s.d->m_data.value(scMaintenanceToolName).toString().isEmpty()) s.d->m_data.insert(scMaintenanceToolName, QLatin1String("maintenancetool")); - if (!s.d->m_data.contains(scTargetConfigurationFile)) + if (s.d->m_data.value(scTargetConfigurationFile).toString().isEmpty()) s.d->m_data.insert(scTargetConfigurationFile, QLatin1String("components.xml")); - if (!s.d->m_data.contains(scMaintenanceToolIniFile)) - s.d->m_data.insert(scMaintenanceToolIniFile, QString(s.maintenanceToolName() + QLatin1String(".ini"))); + if (s.d->m_data.value(scMaintenanceToolIniFile).toString().isEmpty()) { + s.d->m_data.insert(scMaintenanceToolIniFile, QString(s.maintenanceToolName() + + QLatin1String(".ini"))); + } if (!s.d->m_data.contains(scDependsOnLocalInstallerBinary)) s.d->m_data.insert(scDependsOnLocalInstallerBinary, false); if (!s.d->m_data.contains(scRepositorySettingsPageVisible)) |