diff options
author | Niels Weber <niels.weber@digia.com> | 2013-03-08 11:22:02 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2013-03-08 13:41:59 +0100 |
commit | 1acc2e0b11292b03a27d45f821791915a54ba583 (patch) | |
tree | 4797856dfa99f2b6d524012771244622de75414f /tools/common/repositorygen.cpp | |
parent | b78a3d149b5121862cacedd04fd176dc65247b90 (diff) |
Fallback to Name if no DisplayName is provided
Task-number: QTIFW-186
Change-Id: I0ad1bb5c28a40cba98850aba2d45b622891bcae6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'tools/common/repositorygen.cpp')
-rw-r--r-- | tools/common/repositorygen.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 4ca7867af..dcf6b6133 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -172,6 +172,7 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt bool foundDefault = false; bool foundVirtual = false; + bool foundDisplayName = false; const QDomNodeList childNodes = package.childNodes(); for (int i = 0; i < childNodes.count(); ++i) { const QDomNode node = childNodes.at(i); @@ -181,6 +182,8 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt foundDefault = true; if (key == QLatin1String("Virtual")) foundVirtual = true; + if (key == QLatin1String("DisplayName")) + foundDisplayName = true; if (node.isComment() || blackList.contains(key)) continue; // just skip comments and some tags... @@ -198,6 +201,13 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt "mutually exclusive. File: '%0'").arg(packageXmlPath)); } + if (!foundDisplayName) { + qWarning() << "No DisplayName tag found, using component Name instead."; + QDomElement displayNameElement = doc.createElement(QLatin1String("DisplayName")); + displayNameElement.appendChild(doc.createTextNode(it->name)); + update.appendChild(displayNameElement); + } + // get the size of the data quint64 componentSize = 0; quint64 compressedComponentSize = 0; |