blob: e8266e686e17f2f423b287e6e7c9b9088e7f6e4d (
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
|
From 13b9c9d691566eb50009b5e4bdac79a999fa576d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20La=C3=9F?= <bevan@bi-co.net>
Date: Thu, 26 Jan 2023 19:18:56 +0100
Subject: [PATCH 1/3] Quick & Dirty patch to allow finding quazip-qt6 on Arch
Linux
---
pri/quazipdetect.pri | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/pri/quazipdetect.pri b/pri/quazipdetect.pri
index 07bd5621..1fe88bb5 100644
--- a/pri/quazipdetect.pri
+++ b/pri/quazipdetect.pri
@@ -1,29 +1,10 @@
-# Copyright (c) 2021,2023 Fritzing GmbH
+# Copyright (c) 2021 Fritzing GmbH
-message("Using Fritzing quazip detect script.")
-
-QUAZIP_VERSION=1.4
-QUAZIP_PATH=$$absolute_path($$PWD/../../quazip-$$QT_VERSION-$$QUAZIP_VERSION)
-QUAZIP_INCLUDE_PATH=$$QUAZIP_PATH/include/QuaZip-Qt6-$$QUAZIP_VERSION
-QUAZIP_LIB_PATH=$$QUAZIP_PATH/lib
+message("Using custom quazip detect script.")
SOURCES += \
- src/zlibdummy.c \
-
-exists($$QUAZIP_PATH) {
- message("found quazip in $${QUAZIP_PATH}")
- } else {
- error("quazip could not be found at $$QUAZIP_PATH")
- }
-
-INCLUDEPATH += $$QUAZIP_INCLUDE_PATH
-LIBS += -L$$QUAZIP_LIB_PATH -lquazip1-qt$$QT_MAJOR_VERSION
-
-unix {
- message("set rpath for quazip")
- QMAKE_RPATHDIR += $$QUAZIP_LIB_PATH
-}
+ src/zlibdummy.c \
-macx {
- LIBS += -lz
-}
+message("including quazip library on linux")
+INCLUDEPATH += /usr/include/QuaZip-Qt6-1.4/
+LIBS += -lquazip1-qt6
--
2.43.0
|