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, 9 insertions, 3 deletions

diff --git a/src/libs/installer/binaryformatenginehandler.cpp b/src/libs/installer/binaryformatenginehandler.cpp
index a884e3b1c..7f82236cc 100644
--- a/src/libs/installer/binaryformatenginehandler.cpp
+++ b/src/libs/installer/binaryformatenginehandler.cpp
@@ -32,8 +32,9 @@
 **
 **************************************************************************/
 
-#include "binaryformatenginehandler.h"
 #include "binaryformatengine.h"
+#include "binaryformatenginehandler.h"
+#include "productkeycheck.h"
 
 namespace QInstaller {
 
@@ -78,8 +79,10 @@ BinaryFormatEngineHandler *BinaryFormatEngineHandler::instance()
 */
 void BinaryFormatEngineHandler::registerResources(const QList<ResourceCollection> &collections)
 {
-    foreach (const ResourceCollection &collection, collections)
-        m_resources.insert(collection.name(), collection);
+    foreach (const ResourceCollection &collection, collections) {
+        if (ProductKeyCheck::instance()->isValidPackage(QString::fromUtf8(collection.name())))
+            m_resources.insert(collection.name(), collection);
+    }
 }
 
 /*!
@@ -104,6 +107,9 @@ BinaryFormatEngineHandler::registerResource(const QString &fileName, const QStri
     const QByteArray resourceName = path.section(sep, 1, 1).toUtf8();
     const QByteArray collectionName = path.section(sep, 0, 0).toUtf8();
 
+    if (!ProductKeyCheck::instance()->isValidPackage(QString::fromUtf8(collectionName)))
+        return;
+
     m_resources[collectionName].setName(collectionName);
     m_resources[collectionName].appendResource(QSharedPointer<Resource>(new Resource(resourcePath,
         resourceName)));