Merge remote-tracking branch 'origin/1.3'

Change-Id: I4059551829cd42ebde7706057d8f4cca57901037

1 files changed, 17 insertions, 2 deletions

diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 17dd3bfdc..3b0b10813 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
 
@@ -85,7 +98,8 @@ HEADERS += packagemanagercore.h \
     link.h \
     createlinkoperation.h \
     packagemanagercoredata.h \
-    registerqtincreatorqnxoperation.h
+    registerqtincreatorqnxoperation.h \
+    applyproductkeyoperation.h
 
     SOURCES += packagemanagercore.cpp \
     packagemanagercore_p.cpp \
@@ -153,7 +167,8 @@ HEADERS += packagemanagercore.h \
     link.cpp \
     createlinkoperation.cpp \
     packagemanagercoredata.cpp \
-    registerqtincreatorqnxoperation.cpp
+    registerqtincreatorqnxoperation.cpp \
+    applyproductkeyoperation.cpp
 
 RESOURCES += resources/patch_file_lists.qrc \
              resources/installer.qrc