From 61f5549578711152a3abc8906ae2c1c7226c66ad Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 4 Mar 2013 13:31:45 +0100 Subject: Clean up Qt 5 build rules Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich Reviewed-by: Tim Jenssen --- tools/archivegen/archivegen.pro | 2 +- tools/binarycreator/binarycreator.pro | 2 +- tools/repogen/repogen.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 5f5ad3c46..f6a40da4f 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 22c052fd4..342cde286 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. rcc ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index 760161c82..20566d600 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -5,7 +5,7 @@ INCLUDEPATH += . .. ../common include(../../installerfw.pri) QT -= gui -QT += script +QT += script xml CONFIG += console DESTDIR = $$IFW_APP_PATH -- cgit v1.2.3 From 1acc2e0b11292b03a27d45f821791915a54ba583 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Fri, 8 Mar 2013 11:22:02 +0100 Subject: Fallback to Name if no DisplayName is provided Task-number: QTIFW-186 Change-Id: I0ad1bb5c28a40cba98850aba2d45b622891bcae6 Reviewed-by: Karsten Heimrich --- tools/common/repositorygen.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools') 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; -- cgit v1.2.3