1 files changed, 63 insertions, 14 deletions
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index bc4fcbb39..ff7a0eed2 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -4,7 +4,6 @@ INCLUDEPATH += . ..
 
 CONFIG += staticlib
 
-include(../7zip/7zip.pri)
 include(../kdtools/kdtools.pri)
 include(../ifwtools/ifwtools.pri)
 include(../../../installerfw.pri)
@@ -40,16 +39,27 @@ QT += \
     widgets \
     core-private \
     qml-private
-win32:QT += winextras
+
+win32:lessThan(QT_MAJOR_VERSION, 6):QT += winextras
+
+greaterThan(QT_MAJOR_VERSION, 5):QT += core5compat
 
 HEADERS += packagemanagercore.h \
     aspectratiolabel.h \
+    calculatorbase.h \
+    componentalias.h \
+    componentsortfilterproxymodel.h \
+    concurrentoperationrunner.h \
+    genericdatacache.h \
     loggingutils.h \
+    metadata.h \
+    metadatacache.h \
     packagemanagercore_p.h \
     packagemanagergui.h \
     binaryformat.h \
     binaryformatengine.h \
     binaryformatenginehandler.h \
+    fileguard.h \
     repository.h \
     utils.h \
     errors.h \
@@ -90,7 +100,6 @@ HEADERS += packagemanagercore.h \
     constants.h \
     packagemanagerproxyfactory.h \
     createlocalrepositoryoperation.h \
-    lib7z_facade.h \
     link.h \
     createlinkoperation.h \
     packagemanagercoredata.h \
@@ -104,7 +113,6 @@ HEADERS += packagemanagercore.h \
     copyfiletask.h \
     downloadfiletask.h \
     downloadfiletask_p.h \
-    unziptask.h \
     observer.h \
     runextensions.h \
     metadatajob.h \
@@ -131,18 +139,31 @@ HEADERS += packagemanagercore.h \
     keepaliveobject.h \
     systeminfo.h \
     packagesource.h \
-    lib7z_guid.h \
-    lib7z_create.h \
-    lib7z_extract.h \
-    lib7z_list.h \
     repositorycategory.h \
     componentselectionpage_p.h \
     commandlineparser.h \
-    commandlineparser_p.h
+    commandlineparser_p.h \
+    abstractarchive.h \
+    directoryguard.h \
+    archivefactory.h \
+    operationtracer.h \
+    customcombobox.h
 
 SOURCES += packagemanagercore.cpp \
+    abstractarchive.cpp \
+    archivefactory.cpp \
     aspectratiolabel.cpp \
+    calculatorbase.cpp \
+    componentalias.cpp \
+    concurrentoperationrunner.cpp \
+    directoryguard.cpp \
+    fileguard.cpp \
+    componentsortfilterproxymodel.cpp \
+    genericdatacache.cpp \
     loggingutils.cpp \
+    metadata.cpp \
+    metadatacache.cpp \
+    operationtracer.cpp \
     packagemanagercore_p.cpp \
     packagemanagergui.cpp \
     binaryformat.cpp \
@@ -184,7 +205,6 @@ SOURCES += packagemanagercore.cpp \
     permissionsettings.cpp \
     packagemanagerproxyfactory.cpp \
     createlocalrepositoryoperation.cpp \
-    lib7z_facade.cpp \
     link.cpp \
     createlinkoperation.cpp \
     packagemanagercoredata.cpp \
@@ -195,7 +215,6 @@ SOURCES += packagemanagercore.cpp \
     abstractfiletask.cpp \
     copyfiletask.cpp \
     downloadfiletask.cpp \
-    unziptask.cpp \
     observer.cpp \
     metadatajob.cpp \
     protocol.cpp \
@@ -217,7 +236,10 @@ SOURCES += packagemanagercore.cpp \
     packagesource.cpp \
     repositorycategory.cpp \
     componentselectionpage_p.cpp \
-    commandlineparser.cpp
+    commandlineparser.cpp \
+    customcombobox.cpp
+
+macos:SOURCES += fileutils_mac.mm
 
 FORMS += proxycredentialsdialog.ui \
     serverauthenticationdialog.ui
@@ -229,11 +251,38 @@ unix {
     else: SOURCES += adminauthorization_x11.cpp
 }
 
-LIBS += -l7z
+CONFIG(libarchive) {
+    HEADERS += libarchivearchive.h \
+        libarchivewrapper.h \
+        libarchivewrapper_p.h
+
+    SOURCES += libarchivearchive.cpp \
+        libarchivewrapper.cpp \
+        libarchivewrapper_p.cpp
+
+    LIBS += -llibarchive
+}
+
+CONFIG(lzmasdk) {
+    include(../3rdparty/7zip/7zip.pri)
+
+    HEADERS += lib7z_facade.h \
+        lib7z_guid.h \
+        lib7z_create.h \
+        lib7z_extract.h \
+        lib7z_list.h \
+        lib7zarchive.h
+
+    SOURCES += lib7z_facade.cpp \
+        lib7zarchive.cpp
+
+    LIBS += -l7z
+    win32:LIBS += -loleaut32 -luser32
+}
+
 win32 {
     SOURCES += adminauthorization_win.cpp sysinfo_win.cpp
 
-    LIBS += -loleaut32 -luser32     # 7zip
     LIBS += -ladvapi32 -lpsapi      # kdtools
     LIBS += -lole32 -lshell32       # createshortcutoperation