add quazip as a dependency

preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent 5e6e6b96cc
commit f619e13dfe
  1. 12
      OpenBoard.pro
  2. 12
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  3. 9
      src/adaptors/UBExportDocument.cpp
  4. 9
      src/adaptors/UBExportDocumentSetAdaptor.cpp
  5. 9
      src/adaptors/UBExportDocumentSetAdaptor.h
  6. 9
      src/adaptors/UBExportWeb.cpp
  7. 12
      src/adaptors/UBImportCFF.cpp
  8. 12
      src/adaptors/UBImportDocument.cpp
  9. 12
      src/adaptors/UBImportDocumentSetAdaptor.cpp
  10. 6
      src/frameworks/UBFileSystemUtils.cpp

@ -70,11 +70,6 @@ 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 \
@ -115,7 +110,10 @@ 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
@ -163,6 +161,7 @@ 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
@ -420,6 +419,7 @@ macx {
linux-g++* {
CONFIG += link_prl
LIBS += -lcrypto
LIBS += -lquazip
#LIBS += -lprofiler
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save