From 356b68c4fc5f81d74dc5ecc8e8ac76d5e055cc38 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Mon, 18 Mar 2013 14:44:30 +0100 Subject: Remove LogoSmall as it never did anything anyway. Change-Id: Ib3f2e2cdc44c06fe8f3c98ce3ddc7c72811eb8da Reviewed-by: Tim Jenssen --- src/libs/installer/packagemanagercoredata.cpp | 1 - src/libs/installer/settings.cpp | 8 +------- src/libs/installer/settings.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src') diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 4c848f13e..f01ea4475 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -90,7 +90,6 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash &va m_variables.insert(scStartMenuDir, m_settings.startMenuDir()); m_variables.insert(scTargetConfigurationFile, m_settings.configurationFileName()); m_variables.insert(QLatin1String("LogoPixmap"), m_settings.logo()); - m_variables.insert(QLatin1String("LogoSmallPixmap"), m_settings.logoSmall()); m_variables.insert(QLatin1String("WatermarkPixmap"), m_settings.watermark()); const QString description = m_settings.runProgramDescription(); diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index a01836253..79eee652f 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -55,7 +55,6 @@ static const QLatin1String scIcon("Icon"); static const QLatin1String scLogo("Logo"); static const QLatin1String scPages("Pages"); static const QLatin1String scPrefix("Prefix"); -static const QLatin1String scLogoSmall("LogoSmall"); static const QLatin1String scWatermark("Watermark"); static const QLatin1String scProductUrl("ProductUrl"); static const QLatin1String scBackground("Background"); @@ -216,7 +215,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix) QStringList elementList; elementList << scName << scVersion << scTitle << scPublisher << scProductUrl << scTargetDir << scAdminTargetDir - << scIcon << scLogo << scLogoSmall << scWatermark << scBackground + << scIcon << scLogo << scWatermark << scBackground << scStartMenuDir << scUninstallerName << scUninstallerIniFile << scRemoveTargetDir << scRunProgram << scRunProgramDescription << scDependsOnLocalInstallerBinary @@ -290,11 +289,6 @@ QString Settings::logo() const return d->makeAbsolutePath(d->m_data.value(scLogo).toString()); } -QString Settings::logoSmall() const -{ - return d->makeAbsolutePath(d->m_data.value(scLogoSmall).toString()); -} - QString Settings::title() const { return d->m_data.value(scTitle).toString(); diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index 51355d038..8ffbfc004 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -83,7 +83,6 @@ public: static Settings fromFileAndPrefix(const QString &path, const QString &prefix); QString logo() const; - QString logoSmall() const; QString title() const; QString publisher() const; QString url() const; -- cgit v1.2.3