From 60223eba3ee71ec9347b9ad2259759f892386088 Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 1 Feb 2013 14:03:46 +0100 Subject: Check for minimum needed tags in config.xml (Name and Version). Task-number: QTIFW-185 Change-Id: I354dd11978f513304b93e253c20baef77f8b1ba4 Reviewed-by: Niels Weber --- src/libs/installer/settings.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') 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 tag in %1.").arg(file.fileName())); + if (s.d->m_data.value(scVersion).isNull()) + throw Error(QString::fromLatin1("Missing or empty 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")); -- cgit v1.2.3