Add two missing patches.
This commit is contained in:
parent
192bb1d772
commit
469c3c02bf
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474116
11
cad/qcad/files/patch-src_zip_RZip.cpp
Normal file
11
cad/qcad/files/patch-src_zip_RZip.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/zip/RZip.cpp.orig 2018-07-01 14:53:24 UTC
|
||||
+++ src/zip/RZip.cpp
|
||||
@@ -19,7 +19,7 @@
|
||||
//#include <QTextStream>
|
||||
//#include <QResource>
|
||||
|
||||
-#include "JlCompress.h"
|
||||
+#include <quazip5/JlCompress.h>
|
||||
|
||||
#include "RZip.h"
|
||||
|
19
cad/qcad/files/patch-src_zip_zip.pro
Normal file
19
cad/qcad/files/patch-src_zip_zip.pro
Normal file
@ -0,0 +1,19 @@
|
||||
--- src/zip/zip.pro.orig 2018-07-01 14:10:25 UTC
|
||||
+++ src/zip/zip.pro
|
||||
@@ -1,6 +1,6 @@
|
||||
include( ../../shared.pri )
|
||||
|
||||
-INCLUDEPATH+=../3rdparty/quazip/src
|
||||
+# INCLUDEPATH+=../3rdparty/quazip/src
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
|
||||
@@ -23,7 +23,7 @@ else {
|
||||
CONFIG += plugin
|
||||
}
|
||||
TARGET = $${RLIBNAME}zip
|
||||
-LIBS += -l$${RLIBNAME}core -lquazip
|
||||
+LIBS += -l$${RLIBNAME}core -lquazip5
|
||||
OTHER_FILES += zip.dox
|
||||
DEFINES += QCADZIP_LIBRARY
|
||||
RC_FILE = zip.rc
|
Loading…
Reference in New Issue
Block a user