diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-11-14 11:03:29 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-11-14 12:42:12 +0100 |
| commit | b7f7c2784a3908a315e1e9d5025d027951ce549f (patch) | |
| tree | 7bac928adc293c555ab785463fc803cc2c21e8fd /src/libs/installer/settings.cpp | |
| parent | a503c3aae5ceb0cf9d8108e7c8899824c2ba6d7b (diff) | |
Remove long-time deprecated icon setting
Change-Id: Ic17dd39a0c9228537d272ad46d3e126dffc1c4dc
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 06a4c69be..b47076ad7 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -44,7 +44,6 @@ using namespace QInstaller; -static const QLatin1String scIcon("Icon"); static const QLatin1String scInstallerApplicationIcon("InstallerApplicationIcon"); static const QLatin1String scInstallerWindowIcon("InstallerWindowIcon"); static const QLatin1String scLogo("Logo"); @@ -223,7 +222,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, QStringList elementList; elementList << scName << scVersion << scTitle << scPublisher << scProductUrl << scTargetDir << scAdminTargetDir - << scIcon << scInstallerApplicationIcon << scInstallerWindowIcon + << scInstallerApplicationIcon << scInstallerWindowIcon << scLogo << scWatermark << scBanner << scBackground << scStartMenuDir << scMaintenanceToolName << scMaintenanceToolIniFile << scRemoveTargetDir << scRunProgram << scRunProgramArguments << scRunProgramDescription @@ -244,9 +243,6 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, parseMode); } - if (name == scIcon) - qWarning() << "Deprecated element 'Icon'."; - if (s.d->m_data.contains(name)) reader.raiseError(QString::fromLatin1("Element '%1' has been defined before.").arg(name)); @@ -270,13 +266,11 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, throw Error(QString::fromLatin1("Missing or empty <Version> tag in %1.").arg(file.fileName())); // Add some possible missing values - if (!s.d->m_data.contains(scIcon)) - 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)); + s.d->m_data.insert(scInstallerApplicationIcon, QLatin1String(":/installer")); if (!s.d->m_data.contains(scInstallerWindowIcon)) { s.d->m_data.insert(scInstallerWindowIcon, - QString(s.d->m_data.value(scIcon).toString() + s.systemIconSuffix())); + QString(QLatin1String(":/installer") + s.systemIconSuffix())); } if (!s.d->m_data.contains(scRemoveTargetDir)) s.d->m_data.insert(scRemoveTargetDir, scTrue); @@ -341,11 +335,6 @@ QString Settings::background() const return d->absolutePathFromKey(scBackground); } -QString Settings::icon() const -{ - return d->absolutePathFromKey(scIcon, systemIconSuffix()); -} - QString Settings::wizardStyle() const { return d->m_data.value(scWizardStyle).toString(); |