diff options
| -rw-r--r-- | doc/installerfw.qdoc | 3 | ||||
| -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 | ||||
| -rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 1 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 1 |
6 files changed, 1 insertions, 14 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 00d602bce..19253c2df 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -187,9 +187,6 @@ \o Logo \o Filename for a logo used as \a QWizard::LogoPixmap. \row - \o LogoSmall - \o Filename for a logo used as \a QWizard::LogoSmallPixmap. - \row \o Watermark \o Filename for a watermark used as \a QWizard::WatermarkPixmap. \row 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; diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index d52514642..b66764a6e 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -16,7 +16,6 @@ File should contain all elements we allow in a config.xml <Icon>icon</Icon> <Logo>logo</Logo> - <LogoSmall>logo_small</LogoSmall> <Watermark>watermark</Watermark> <Background>background</Background> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index a578ea37e..a4239c1dc 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -35,7 +35,6 @@ void tst_Settings::loadTutorialConfig() // default values QCOMPARE(settings.logo(), QLatin1String(":///data/")); - QCOMPARE(settings.logoSmall(), QLatin1String(":///data/")); QCOMPARE(settings.url(), QString()); QCOMPARE(settings.watermark(), QLatin1String(":///data/")); QCOMPARE(settings.background(), QLatin1String(":///data/")); |