diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
commit | de8d24fa6ccca3b201a8468d90631af7124c9c3c (patch) | |
tree | a9d6928741a6725a0c858108943247d301db777a /tools | |
parent | 887efb810f4773ed0b4cf8c8cc3e53ec846c8146 (diff) | |
parent | 9e4194a90026cfc9fce2d59256813193e54859d6 (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
Diffstat (limited to 'tools')
-rw-r--r-- | tools/archivegen/archivegen.pro | 2 | ||||
-rw-r--r-- | tools/binarycreator/binarycreator.pro | 2 | ||||
-rw-r--r-- | tools/common/repositorygen.cpp | 10 | ||||
-rw-r--r-- | tools/repogen/repogen.pro | 2 |
4 files changed, 13 insertions, 3 deletions
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/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; 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 |