blob: 4e77ff9435ab74dc934448e0a7e8a766a0807d23 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 7e01cb556ce5daee19b0270dded8eca9fcb1ea60 Mon Sep 17 00:00:00 2001
From: Victor Kustov <ktrace@yandex.ru>
Date: Tue, 25 May 2021 01:52:57 +0300
Subject: [PATCH] Fix for quazip 1.x usage
---
libs/librepcb/common/common.pro | 2 +-
libs/librepcb/common/fileio/transactionalfilesystem.cpp | 6 +++---
libs/librepcb/common/network/filedownload.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libs/librepcb/common/common.pro b/libs/librepcb/common/common.pro
index 6a6b623..d6ce077 100644
--- a/libs/librepcb/common/common.pro
+++ b/libs/librepcb/common/common.pro
@@ -333,7 +333,7 @@ FORMS += \
# quazip
contains(UNBUNDLE, quazip) {
- PKGCONFIG += quazip
+ PKGCONFIG += quazip1-qt5
} else {
INCLUDEPATH += ../../quazip
}
diff --git a/libs/librepcb/common/fileio/transactionalfilesystem.cpp b/libs/librepcb/common/fileio/transactionalfilesystem.cpp
index c98c84e..7b4927b 100644
--- a/libs/librepcb/common/fileio/transactionalfilesystem.cpp
+++ b/libs/librepcb/common/fileio/transactionalfilesystem.cpp
@@ -27,9 +27,9 @@
#include "sexpression.h"
#ifdef SYSTEM_QUAZIP
-#include <quazip5/quazip.h>
-#include <quazip5/quazipdir.h>
-#include <quazip5/quazipfile.h>
+#include <quazip.h>
+#include <quazipdir.h>
+#include <quazipfile.h>
#else
#include <quazip/quazip.h>
#include <quazip/quazipdir.h>
diff --git a/libs/librepcb/common/network/filedownload.cpp b/libs/librepcb/common/network/filedownload.cpp
index 110fae3..718a137 100644
--- a/libs/librepcb/common/network/filedownload.cpp
+++ b/libs/librepcb/common/network/filedownload.cpp
@@ -27,7 +27,7 @@
#include <QtCore>
#ifdef SYSTEM_QUAZIP
-#include <quazip5/JlCompress.h>
+#include <JlCompress.h>
#else
#include <quazip/JlCompress.h>
#endif
--
2.26.3
|
GitWeb
