Switched quazip to dynamic linking only.

phoenix.pro

@@ -104,9 +104,6 @@ unix {
         } else {
             DEFINES += LINUX_32
         }
-        !contains(DEFINES, QUAZIP_INSTALLED) {
-            LIBS += -lz
-        }
     }
 
     isEmpty(PREFIX) {
@@ -179,7 +176,7 @@ LIBGIT_STATIC = true
 include(pri/libgit2detect.pri)
 
 include(pri/boostdetect.pri)
-
+include(pri/quazipdetect.pri)
 include(pri/kitchensink.pri)
 include(pri/mainwindow.pri)
 include(pri/partsbinpalette.pri)
@@ -203,13 +200,6 @@ include(pri/program.pri)
 include(pri/qtsysteminfo.pri)
 include(test/version.pri)
 
-contains(DEFINES, QUAZIP_INSTALLED) {
-    !build_pass:message("using installed QuaZIP library")
-    LIBS += -lquazip5
-} else {
-    include(pri/quazip.pri)
-}
-
 TARGET = Fritzing
 TEMPLATE = app
 

pri/libgit2detect.pri

@@ -68,4 +68,5 @@ unix {
         #message("Enabled dynamic linking of libgit2")
         PKGCONFIG += libgit2
     }
+    LIBS += -lz
 }

pri/quazipdetect.pri

@@ -0,0 +1,57 @@
+# Copyright (c) 2021 Fritzing GmbH
+
+message("Using fritzing quazip detect script.")
+
+exists($$absolute_path($$PWD/../../quazip_qt5)) {
+        QUAZIPPATH = $$absolute_path($$PWD/../../quazip_qt5)
+        message("found quazip in $${QUAZIPPATH}")
+    } else {
+        error("quazip could not be found.")
+    }
+
+message("including $$absolute_path($${QUAZIPPATH}/include/quazip)")
+
+unix:!macx {
+    message("including quazip library on linux")
+    INCLUDEPATH += $$absolute_path($${QUAZIPPATH}/include/quazip)
+    LIBS += -L$$absolute_path($${QUAZIPPATH}/lib) -lquazip1-qt5
+    QMAKE_RPATHDIR += $$absolute_path($${QUAZIPPATH}/lib)
+    LIBS += -lz
+}
+
+macx {
+    message("including quazip library on mac os")
+    INCLUDEPATH += $$absolute_path($${QUAZIPPATH}/include/quazip)
+    LIBS += -L$$absolute_path($${QUAZIPPATH}/lib) -lquazip1-qt5
+    QMAKE_RPATHDIR += $$absolute_path($${QUAZIPPATH}/lib)
+    LIBS += -lz
+}
+
+win32 {
+
+    message("including quazip library on windows")
+
+    QUAZIPINCLUDE = $$absolute_path($${QUAZIPPATH}/include/quazip)
+    exists($$QUAZIPINCLUDE/quazip.h) {
+        message("found quazip include path at $$QUAZIPINCLUDE")
+    } else {
+        message("Fritzing requires quazip")
+        error("quazip include path not found in $$QUAZIPINCLUDE")
+    }
+
+    INCLUDEPATH += $$QUAZIPINCLUDE
+
+    contains(QMAKE_TARGET.arch, x86_64) {
+        QUAZIPLIB = $$absolute_path($$QUAZIPPATH/build64/Release)
+    } else {
+        QUAZIPLIB = $$absolute_path($$QUAZIPPATH/build32/Release)
+    }
+
+    exists($$QUAZIPLIB/quazip1-qt5.lib) {
+        message("found quazip library in $$QUAZIPLIB")
+    } else {
+        error("quazip library not found in $$QUAZIPLIB")
+    }
+
+    LIBS += -L$$QUAZIPLIB -lquazip1-qt5
+}