Merge remote-tracking branch 'origin/1.3'

Change-Id: I4059551829cd42ebde7706057d8f4cca57901037

1 files changed, 10 insertions, 0 deletions

diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 34ae36889..9f5a4d654 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;