diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-05 12:18:37 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-11 11:44:29 +0100 |
commit | 9e4194a90026cfc9fce2d59256813193e54859d6 (patch) | |
tree | 8bfa1ec2fad2d7c3d01a2243a7d36f2e77588d89 /src/sdk | |
parent | 1acc2e0b11292b03a27d45f821791915a54ba583 (diff) |
added first version of a product key checker API
This is more temporary solution to be able to use
the 1.3 for new Qt releases.
Change-Id: Ic28c75547da7d4d0c2efcca08cdbd76f4a0ad9f6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/sdk')
-rw-r--r-- | src/sdk/installerbasecommons.cpp | 6 | ||||
-rw-r--r-- | src/sdk/tabcontroller.cpp | 6 |
2 files changed, 11 insertions, 1 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/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> ¶ms) 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 |