From 61f5549578711152a3abc8906ae2c1c7226c66ad Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 4 Mar 2013 13:31:45 +0100
Subject: Clean up Qt 5 build rules

Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/libs/installer/installer.pro | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/libs/installer/installer.pro')

diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 322c3551c..f4f416cbc 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -11,10 +11,15 @@ DLLDESTDIR = $$IFW_APP_PATH
 
 DEFINES += BUILD_LIB_INSTALLER
 
-QT += script \
+QT += \
+    script \
     network \
     xml
 
+isEqual(QT_MAJOR_VERSION, 5) {
+  QT += concurrent widgets core-private
+}
+
 HEADERS += packagemanagercore.h \
     packagemanagercore_p.h \
     packagemanagergui.h \
-- 
cgit v1.2.3


From 9e4194a90026cfc9fce2d59256813193e54859d6 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Tue, 5 Mar 2013 12:18:37 +0100
Subject: 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>
---
 src/libs/installer/installer.pro | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/libs/installer/installer.pro')

diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index f4f416cbc..3308876fb 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -6,6 +6,19 @@ include(../7zip/7zip.pri)
 include(../kdtools/kdtools.pri)
 include(../../../installerfw.pri)
 
+# productkeycheck API
+# call qmake "PRODUCTKEYCHECK_PRI_FILE=<your_path_to_pri_file>"
+# content of that pri file needs to be:
+#   SOURCES += $$PWD/productkeycheck.cpp
+#   ...
+#   your files if needed
+HEADERS += productkeycheck.h
+!isEmpty(PRODUCTKEYCHECK_PRI_FILE) {
+    include($$PRODUCTKEYCHECK_PRI_FILE)
+} else {
+    SOURCES += productkeycheck.cpp
+}
+
 DESTDIR = $$IFW_LIB_PATH
 DLLDESTDIR = $$IFW_APP_PATH
 
@@ -90,7 +103,8 @@ HEADERS += packagemanagercore.h \
     lib7z_facade.h \
     link.h \
     createlinkoperation.h \
-    packagemanagercoredata.h
+    packagemanagercoredata.h \
+    applyproductkeyoperation.h
 
     SOURCES += packagemanagercore.cpp \
     packagemanagercore_p.cpp \
@@ -158,7 +172,8 @@ HEADERS += packagemanagercore.h \
     lib7z_facade.cpp \
     link.cpp \
     createlinkoperation.cpp \
-    packagemanagercoredata.cpp
+    packagemanagercoredata.cpp \
+    applyproductkeyoperation.cpp
 
 RESOURCES += resources/patch_file_lists.qrc \
              resources/installer.qrc
-- 
cgit v1.2.3