diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-04-17 23:10:16 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-04-28 13:57:56 +0200 |
| commit | f56c263c1220765d6f6bf74e04ddbb23c0e96a88 (patch) | |
| tree | cbab92a0e21fb62421f5ac999cac9054cb9b790f /src/libs/installer/settings.cpp | |
| parent | 632707d34d1cf28ef55529956a4a4caf95ea6c72 (diff) | |
Make sure we return an empty path if value is not set.
Change-Id: Ibc95455b7e8ff428c173c6eb0d181a9a655fd023
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 90cb431f4..56041916e 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -171,8 +171,13 @@ public: QVariantHash m_data; bool m_replacementRepos; - QString makeAbsolutePath(const QString &path) const + QString absolutePathFromKey(const QString &key, const QString &suffix = QString()) const { + const QString value = m_data.value(key).toString(); + if (value.isEmpty()) + return QString(); + + const QString path = value + suffix; if (QFileInfo(path).isAbsolute()) return path; return m_data.value(scPrefix).toString() + QLatin1String("/") + path; @@ -296,7 +301,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, QString Settings::logo() const { - return d->makeAbsolutePath(d->m_data.value(scLogo).toString()); + return d->absolutePathFromKey(scLogo); } QString Settings::title() const @@ -326,22 +331,22 @@ QString Settings::url() const QString Settings::watermark() const { - return d->makeAbsolutePath(d->m_data.value(scWatermark).toString()); + return d->absolutePathFromKey(scWatermark); } QString Settings::banner() const { - return d->makeAbsolutePath(d->m_data.value(scBanner).toString()); + return d->absolutePathFromKey(scBanner); } QString Settings::background() const { - return d->makeAbsolutePath(d->m_data.value(scBackground).toString()); + return d->absolutePathFromKey(scBackground); } QString Settings::icon() const { - return d->makeAbsolutePath(d->m_data.value(scIcon).toString() + systemIconSuffix()); + return d->absolutePathFromKey(scIcon, systemIconSuffix()); } QString Settings::wizardStyle() const @@ -356,12 +361,12 @@ QString Settings::titleColor() const QString Settings::installerApplicationIcon() const { - return d->makeAbsolutePath(d->m_data.value(scInstallerApplicationIcon).toString() + systemIconSuffix()); + return d->absolutePathFromKey(scInstallerApplicationIcon, systemIconSuffix()); } QString Settings::installerWindowIcon() const { - return d->makeAbsolutePath(d->m_data.value(scInstallerWindowIcon).toString()); + return d->absolutePathFromKey(scInstallerWindowIcon); } QString Settings::systemIconSuffix() const |