Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
f619e13d
Commit
f619e13d
authored
Feb 20, 2019
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add quazip as a dependency
parent
5e6e6b96
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
75 additions
and
27 deletions
+75
-27
OpenBoard.pro
OpenBoard.pro
+6
-6
UBCFFAdaptor.cpp
plugins/cffadaptor/src/UBCFFAdaptor.cpp
+9
-3
UBExportDocument.cpp
src/adaptors/UBExportDocument.cpp
+7
-2
UBExportDocumentSetAdaptor.cpp
src/adaptors/UBExportDocumentSetAdaptor.cpp
+7
-2
UBExportDocumentSetAdaptor.h
src/adaptors/UBExportDocumentSetAdaptor.h
+7
-2
UBExportWeb.cpp
src/adaptors/UBExportWeb.cpp
+7
-2
UBImportCFF.cpp
src/adaptors/UBImportCFF.cpp
+9
-3
UBImportDocument.cpp
src/adaptors/UBImportDocument.cpp
+9
-3
UBImportDocumentSetAdaptor.cpp
src/adaptors/UBImportDocumentSetAdaptor.cpp
+9
-3
UBFileSystemUtils.cpp
src/frameworks/UBFileSystemUtils.cpp
+5
-1
No files found.
OpenBoard.pro
View file @
f619e13d
...
...
@@ -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
...
...
plugins/cffadaptor/src/UBCFFAdaptor.cpp
View file @
f619e13d
...
...
@@ -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
()
...
...
src/adaptors/UBExportDocument.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/adaptors/UBExportDocumentSetAdaptor.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/adaptors/UBExportDocumentSetAdaptor.h
View file @
f619e13d
...
...
@@ -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
;
...
...
src/adaptors/UBExportWeb.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/adaptors/UBImportCFF.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/adaptors/UBImportDocument.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/adaptors/UBImportDocumentSetAdaptor.cpp
View file @
f619e13d
...
...
@@ -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"
...
...
src/frameworks/UBFileSystemUtils.cpp
View file @
f619e13d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment