reactivate license adding method

2 files changed, 6 insertions, 23 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 264205522..66bb6f5e2 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -1279,7 +1279,7 @@ void PackageManagerCorePrivate::runPackageUpdater()
         if (!QFileInfo(installerBinaryPath()).isWritable() || !QFileInfo(packagesXml).isWritable())
             adminRightsGained = m_core->gainAdminRights();
 
-        const QList<Component*> componentsToInstall = m_core->componentsToInstall(m_core->runMode());
+        const QList<Component*> componentsToInstall = m_core->orderedComponentsToInstall();
         verbose() << "Install size: " << componentsToInstall.size() << " components " << std::endl;
 
         bool updateAdminRights = false;
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index 416ba398b..aa170a909 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -849,28 +849,11 @@ void LicenseAgreementPage::entering()
     m_licenseListWidget->setVisible(false);
     m_textBrowser->setText(QLatin1String(""));
 
-    QString notSureWhichComponentListIsNeeded;
-//    RunMode runMode = packageManagerCore()->runMode();
-//    QList<QInstaller::Component*> components = packageManagerCore()->components(false, runMode);
-
-//    QInstaller::Component *rootComponent = 0;
-//    // TODO: this needs to be fixed once we support several root components
-//    foreach (QInstaller::Component* root, components) {
-//        if (root->isInstalled())
-//            continue;
-
-//        const QHash<QString, QPair<QString, QString> > &hash = root->licenses();
-//        if (!hash.isEmpty()) {
-//            addLicenseItem(hash);
-//            rootComponent = root;
-//        }
-//    }
-
-//    components = packageManagerCore()->componentsToInstall(runMode);
-//    foreach (QInstaller::Component* component, components) {
-//        if (rootComponent != component && !component->isInstalled())
-//            addLicenseItem(component->licenses());
-//    }
+    QList<QInstaller::Component*> components = packageManagerCore()->orderedComponentsToInstall();
+
+    foreach (QInstaller::Component* component, components) {
+        addLicenseItem(component->licenses());
+    }
 
     const int licenseCount = m_licenseListWidget->count();
     if (licenseCount > 0) {