Fixed QTSDK-961

 - added support for version inheritance attributes to repogen
 - added version inheritance for components
 - 'inheritVersionFrom' attribute can be set for Version tags

added support for version inheritance attributes to repogen

Change-Id: I7e9a3a71620de2d8ffed0e0296b68f307304d9f6
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>

2 files changed, 19 insertions, 7 deletions

diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 6186f0389..651badf41 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -398,7 +398,12 @@ void QInstaller::generateMetaDataDirectory(const QString& metapath_, const QStri
             if (key == QString::fromLatin1("Licenses"))
                 continue;
             const QString value = node.toElement().text();
-            update.appendChild(doc.createElement(key)).appendChild(doc.createTextNode(value));
+            QDomElement element = doc.createElement(key);
+            for (int  i = 0; i < node.attributes().size(); i++) {
+                element.setAttribute(node.attributes().item(i).toAttr().name(),
+                                     node.attributes().item(i).toAttr().value());
+            }
+            update.appendChild(element).appendChild(doc.createTextNode(value));
         }
 
         // get the size of the data
diff --git a/installerbuilder/common/repositorygen.h b/installerbuilder/common/repositorygen.h
index 4c0b95f66..0e149a9ca 100644
--- a/installerbuilder/common/repositorygen.h
+++ b/installerbuilder/common/repositorygen.h
@@ -40,13 +40,20 @@ namespace QInstaller {
 
 
     QMap<QString, QString> buildPathToVersionMap( const QVector<PackageInfo>& info );
-    void compressMetaDirectories( const QString& configDir, const QString& repoDir, const QString& baseDir, const QMap<QString, QString>& versionMapping );
+    void compressMetaDirectories( const QString &configDir, const QString &repoDir, const QString &baseDir,
+                                  const QMap<QString, QString> &versionMapping );
     void compressMetaDirectories( const QString& configDir, const QString& repoDir );
-    void compressDirectory( const QStringList& paths, const QString& archivePath );
-    void copyComponentData( const QString& packageDir, const QString& configDir, const QString& repoDir, const QVector<PackageInfo>& infos );
-    void generateMetaDataDirectory( const QString& outDir, const QString& dataDir, const QVector<PackageInfo>& packages, const QString& appName, const QString& appVersion );
-    QVector<PackageInfo> createListOfPackages( const QStringList& components, const QString& packagesDirectory, bool addDependencies = true );
-    void generateMetaDataDirectory( const QString& outDir, const QString& dataDir, const QVector<PackageInfo>& packages, const QString& appName, const QString& appVersion );
+    void compressDirectory( const QStringList &paths, const QString &archivePath );
+    void copyComponentData( const QString &packageDir, const QString &configDir, const QString &repoDir,
+                            const QVector<PackageInfo> &infos );
+    void generateMetaDataDirectory( const QString &outDir, const QString &dataDir,
+                                    const QVector<PackageInfo> &packages, const QString &appName,
+                                    const QString& appVersion );
+    QVector<PackageInfo> createListOfPackages( const QStringList &components, const QString &packagesDirectory,
+                                               bool addDependencies = true );
+    void generateMetaDataDirectory( const QString &outDir, const QString &dataDir,
+                                    const QVector<PackageInfo> &packages, const QString &appName,
+                                    const QString &appVersion );
 }
 
 #endif // QINSTALLER_REPOSITORYGEN_H