3 files changed, 17 insertions, 2 deletions
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 6ae1ddc3a..5a08d20d3 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -45,6 +45,8 @@
 #include <packagemanagercore.h>
 #include <settings.h>
 
+#include <productkeycheck.h>
+
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTimer>
@@ -112,6 +114,8 @@ IntroductionPageImpl::IntroductionPageImpl(QInstaller::PackageManagerCore *core)
 
     connect(core, SIGNAL(metaJobInfoMessage(QString)), this, SLOT(setMessage(QString)));
     connect(core, SIGNAL(coreNetworkSettingsChanged()), this, SLOT(onCoreNetworkSettingsChanged()));
+
+    m_updateComponents->setEnabled(ProductKeyCheck::instance()->hasValidKey());
 }
 
 int IntroductionPageImpl::nextId() const
@@ -230,7 +234,7 @@ void IntroductionPageImpl::showMaintenanceTools()
 void IntroductionPageImpl::setMaintenanceToolsEnabled(bool enable)
 {
     m_packageManager->setEnabled(enable);
-    m_updateComponents->setEnabled(enable);
+    m_updateComponents->setEnabled(enable && ProductKeyCheck::instance()->hasValidKey());
     m_removeAllComponents->setEnabled(enable);
 }
 
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro
index d376535b0..a986b41ef 100644
--- a/src/sdk/sdk.pro
+++ b/src/sdk/sdk.pro
@@ -4,7 +4,12 @@ TARGET = installerbase
 
 include(../../installerfw.pri)
 
-QT += network script
+QT += network script xml
+
+isEqual(QT_MAJOR_VERSION, 5) {
+  QT += widgets
+}
+
 DESTDIR = $$IFW_APP_PATH
 
 if (exists($$LRELEASE)) {
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index ad9b1db13..95b6298ee 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -45,6 +45,8 @@
 
 #include <packagemanagercore.h>
 
+#include <productkeycheck.h>
+
 #include <QtCore/QTimer>
 #include <QtScript/QScriptEngine>
 
@@ -123,6 +125,10 @@ void TabController::setManagerParams(const QHash<QString, QString> &params)
 
 int TabController::init()
 {
+    if (!ProductKeyCheck::instance()->hasValidKey() && d->m_core->isInstaller()) {
+        return PackageManagerCore::Failure;
+    }
+
     if (!d->m_init) {
         d->m_init = true;
         // this should called as early as possible, to handle error message boxes for example