You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
1.8 KiB
58 lines
1.8 KiB
3 years ago
|
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
|
||
|
|