summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/settings.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-02-01 14:03:46 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2013-02-01 14:13:02 +0100
commit60223eba3ee71ec9347b9ad2259759f892386088 (patch)
treec727193e9b52e341a8135b08bf14e1ff1837f12f /src/libs/installer/settings.cpp
parent96bfbec76b8cda4ea72f80819a2e0c6c404fcb99 (diff)
Check for minimum needed tags in config.xml (Name and Version).
Task-number: QTIFW-185 Change-Id: I354dd11978f513304b93e253c20baef77f8b1ba4 Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/settings.cpp')
-rw-r--r--src/libs/installer/settings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index d2acb2b8a..4acd2026a 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -231,6 +231,11 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
.arg(reader.errorString()).arg(reader.lineNumber()).arg(reader.columnNumber()));
}
+ if (s.d->m_data.value(scName).isNull())
+ throw Error(QString::fromLatin1("Missing or empty <Name> tag in %1.").arg(file.fileName()));
+ if (s.d->m_data.value(scVersion).isNull())
+ 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"));