diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-18 16:06:12 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-18 16:06:48 +0100 |
| commit | b622922240c00a6e7c2b4e4e5ad995c2fe675d88 (patch) | |
| tree | eab55cf013bc27ff13c89844cba89c2ee1674c16 /src/libs/installer | |
| parent | 99c26d57ab877da638acf1cd292490ef412ec171 (diff) | |
| parent | 356b68c4fc5f81d74dc5ecc8e8ac76d5e055cc38 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I36a907cf2ee075eace35dcc42317f4202c1f5569
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 1 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 8 | ||||
| -rw-r--r-- | src/libs/installer/settings.h | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index b15b2796c..97b748970 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -90,7 +90,6 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &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 6503b8778..b019b12ba 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -54,7 +54,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"); @@ -215,7 +214,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 << scRunProgramArguments << scRunProgramDescription << scDependsOnLocalInstallerBinary @@ -289,11 +288,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 db7212b1e..35a61a841 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; |