Revert "add quazip as a dependency"

This reverts commit f619e13dfe.

OpenBoard.pro

@@ -70,6 +70,11 @@ include(src/pdf-merger/pdfMerger.pri)
 include(plugins/plugins.pri)
 INCLUDEPATH += plugins/cffadaptor/src
 
+#ThirdParty
+DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
+INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+
 FORMS += resources/forms/mainWindow.ui \
    resources/forms/preferences.ui \
    resources/forms/brushProperties.ui \
@@ -110,10 +115,7 @@ RCC_DIR = $$BUILD_DIR/rcc
 UI_DIR = $$BUILD_DIR/ui
 
 win32 {
-    #ThirdParty
+
-    DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
-    INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
-    include($$THIRD_PARTY_PATH/quazip/quazip.pri)
 
    LIBS += -lUser32
    LIBS += -lGdi32
@@ -161,7 +163,6 @@ macx {
    LIBS += -framework AVFoundation
    LIBS += -framework CoreMedia
    LIBS += -lcrypto
-   LIBS += -lquazip
 
    CONFIG(release, debug|release):CONFIG += x86_64
    CONFIG(debug, debug|release):CONFIG += x86_64
@@ -419,7 +420,6 @@ macx {
 linux-g++* {
     CONFIG += link_prl
     LIBS += -lcrypto
-    LIBS += -lquazip
     #LIBS += -lprofiler
     LIBS += -lX11
     QMAKE_CFLAGS += -fopenmp

plugins/cffadaptor/src/UBCFFAdaptor.cpp

@@ -34,15 +34,9 @@
 #include "UBCFFConstants.h"
 
 //THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
+#include "quazipfileinfo.h"
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
 //THIRD_PARTY_WARNINGS_ENABLE
 
 UBCFFAdaptor::UBCFFAdaptor()

src/adaptors/UBExportDocument.cpp

@@ -40,13 +40,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/adaptors/UBExportDocumentSetAdaptor.cpp

@@ -41,13 +41,8 @@
 #include "core/UBForeignObjectsHandler.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/adaptors/UBExportDocumentSetAdaptor.h

@@ -34,13 +34,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 class UBDocumentProxy;

src/adaptors/UBExportWeb.cpp

@@ -40,13 +40,8 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/adaptors/UBImportCFF.cpp

@@ -44,15 +44,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
+#include "quazipfileinfo.h"
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/adaptors/UBImportDocument.cpp

@@ -39,15 +39,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
+#include "quazipfileinfo.h"
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/adaptors/UBImportDocumentSetAdaptor.cpp

@@ -37,15 +37,9 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+#include "quazip.h"
-    #include <quazip/quazip.h>
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
+#include "quazipfileinfo.h"
-    #include <quazip/quazipfileinfo.h>
-#else
-    #include "quazip.h"
-    #include "quazipfile.h"
-    #include "quazipfileinfo.h"
-#endif
 THIRD_PARTY_WARNINGS_ENABLE
 
 #include "core/memcheck.h"

src/frameworks/UBFileSystemUtils.cpp

@@ -36,11 +36,7 @@
 #include "globals/UBGlobals.h"
 
 THIRD_PARTY_WARNINGS_DISABLE
-#ifdef Q_OS_LINUX
+#include "quazipfile.h"
-    #include <quazip/quazipfile.h>
-#else
-    #include "quazipfile.h"
-#endif
 #include <openssl/md5.h>
 THIRD_PARTY_WARNINGS_ENABLE