summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/productkeycheck.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-10 12:33:21 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2014-11-11 16:49:28 +0100
commit26e4af07b19135db61919dfaab9243f17d328f50 (patch)
treeda2fbb42a0a5efab51d80ba8a3adf0ba65dc6322 /src/libs/installer/productkeycheck.h
parent3030607e6445ba98597c3118b0afc29715ff9305 (diff)
Move ProductKeyCheck out of QInstaller namespace
Commit 77b1e168202e moved ProductKeyCheck into the QInstaller namespace. This causes problems in the commercial license checker that has to support both 1.6 and master. Change-Id: Ifcf6548ebdfaac65a1dccdc179239a28c90c6fe9 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/productkeycheck.h')
-rw-r--r--src/libs/installer/productkeycheck.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/installer/productkeycheck.h b/src/libs/installer/productkeycheck.h
index 3b0ceb086..db8a6a8d6 100644
--- a/src/libs/installer/productkeycheck.h
+++ b/src/libs/installer/productkeycheck.h
@@ -42,9 +42,10 @@
namespace QInstaller {
class PackageManagerCore;
-class ProductKeyCheckPrivate;
class Repository;
+} // QInstaller
+
class INSTALLER_EXPORT ProductKeyCheck
{
Q_DISABLE_COPY(ProductKeyCheck)
@@ -52,7 +53,7 @@ class INSTALLER_EXPORT ProductKeyCheck
public:
~ProductKeyCheck();
static ProductKeyCheck *instance();
- void init(PackageManagerCore *core);
+ void init(QInstaller::PackageManagerCore *core);
// was validLicense
bool hasValidKey();
@@ -75,9 +76,7 @@ public:
private:
ProductKeyCheck();
- ProductKeyCheckPrivate *const d;
+ class ProductKeyCheckPrivate *const d;
};
-} // namespace QInstaller
-
#endif // PRODUCTKEYCHECK_H