Implement package filtering for online and offline installer.

Change-Id: If17725c0d97111aff67bcc0bc060fb74bb1109cd
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 054a587b9..f262152ae 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -104,15 +104,16 @@ int InstallerBase::run()
     }
 
     SDKApp::registerMetaResources(manager.collectionByName("QResources"));
-    QInstaller::BinaryFormatEngineHandler::instance()->registerResources(manager.collections());
-
+    m_core = new QInstaller::PackageManagerCore(magicMarker, oldOperations);
+    {
+        using namespace QInstaller;
+        ProductKeyCheck::instance()->init(m_core);
+        ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml"));
+        BinaryFormatEngineHandler::instance()->registerResources(manager.collections());
+    }
     if (QInstaller::isVerbose())
         dumpResourceTree();
 
-    // instantiate the installer we are actually going to use
-    m_core = new QInstaller::PackageManagerCore(magicMarker, oldOperations);
-    QInstaller::ProductKeyCheck::instance()->init(m_core);
-
     CommandLineParser parser;
     parser.parse(arguments());