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/libs/installer/packagemanagercore_p.cpp | |
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/libs/installer/packagemanagercore_p.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 3bdb73ae0..e5fd39eaf 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -60,7 +60,9 @@ #include "kdupdaterupdateoperationfactory.h" #include "kdupdaterupdatefinder.h" -#include <QtConcurrentRun> +#include <productkeycheck.h> + +#include <QtCore/QtConcurrentRun> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDirIterator> @@ -555,6 +557,16 @@ QString PackageManagerCorePrivate::installReason(Component *component) void PackageManagerCorePrivate::initialize(const QHash<QString, QString> ¶ms) { + if (!ProductKeyCheck::instance()->hasValidKey()) { + if (m_core->isInstaller()) { + setStatus(PackageManagerCore::Failure, ProductKeyCheck::instance()->lastErrorString()); + } else { + MessageBoxHandler::warning(MessageBoxHandler::currentBestSuitParent(), + QLatin1String("ProductKeyCheckError"), ProductKeyCheck::instance()->lastErrorString(), + ProductKeyCheck::instance()->maintainanceToolDetailErrorNotice(), QMessageBox::Ok); + } + } + m_coreCheckedHash.clear(); m_data = PackageManagerCoreData(params); m_componentsToInstallCalculated = false; |