diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-12 15:10:15 +0100 |
commit | de8d24fa6ccca3b201a8468d90631af7124c9c3c (patch) | |
tree | a9d6928741a6725a0c858108943247d301db777a /src/libs/installer/component.cpp | |
parent | 887efb810f4773ed0b4cf8c8cc3e53ec846c8146 (diff) | |
parent | 9e4194a90026cfc9fce2d59256813193e54859d6 (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
Diffstat (limited to 'src/libs/installer/component.cpp')
-rw-r--r-- | src/libs/installer/component.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 064e74cb5..fb554155f 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -50,6 +50,8 @@ #include <kdupdaterupdatesourcesinfo.h> #include <kdupdaterupdateoperationfactory.h> +#include <productkeycheck.h> + #include <QtCore/QDirIterator> #include <QtCore/QTranslator> @@ -497,6 +499,10 @@ void Component::loadLicenses(const QString &directory, const QHash<QString, QVar QHash<QString, QVariant>::const_iterator it; for (it = licenseHash.begin(); it != licenseHash.end(); ++it) { const QString &fileName = it.value().toString(); + + if (!ProductKeyCheck::instance()->isValidLicense(fileName)) + continue; + QFileInfo fileInfo(fileName); QFile file(QString::fromLatin1("%1%2_%3.%4").arg(directory, fileInfo.baseName(), QLocale().name().toLower(), fileInfo.completeSuffix())); |