@@ -1,141 +0,0 @@
1−From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001
2−From: kiozen <oliver.eichler@gmx.de>
3−Date: Sat, 20 Mar 2021 12:14:29 +0100
4−Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x
5−
6−Simply adjusted the cmake scripts
7−---
8− CMakeLists.txt | 2 +-
9− src/qmapshack/CMakeLists.txt | 27 +++++++++++++--------------
10− 3 files changed, 15 insertions(+), 15 deletions(-)
11−
12−diff --git a/CMakeLists.txt b/CMakeLists.txt
13−index 8d2cf127..7420d9b2 100644
14−--- a/CMakeLists.txt
15−+++ b/CMakeLists.txt
16−@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED)
17− find_package(PROJ REQUIRED)
18− find_package(JPEG REQUIRED)
19− find_package(ROUTINO REQUIRED)
20−-find_package(QuaZip5 REQUIRED)
21−+find_package(QuaZip-Qt5 REQUIRED)
22− find_package(ALGLIB ) # optional as we can use our local version
23−
24−
25−diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt
26−index 08eeb183..9b3836d6 100644
27−--- a/src/qmapshack/CMakeLists.txt
28−+++ b/src/qmapshack/CMakeLists.txt
29−@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH})
30− # All source files needed to compile
31− ###############################################################################################
32−
33−-set( SRCS
34−- CAbout.cpp
35−+set( SRCS
36−+ CAbout.cpp
37− CMainWindow.cpp
38− CSingleInstanceProxy.cpp
39− canvas/CCanvas.cpp
40−@@ -160,7 +160,7 @@ set( SRCS
41− gis/trk/CInvalidTrk.cpp
42− gis/trk/CKnownExtension.cpp
43− gis/trk/CListTrkPts.cpp
44−- gis/trk/CPropertyTrk.cpp
45−+ gis/trk/CPropertyTrk.cpp
46− gis/trk/CScrOptTrk.cpp
47− gis/trk/CSelectActivityColor.cpp
48− gis/trk/CTableTrk.cpp
49−@@ -272,7 +272,7 @@ set( SRCS
50− mouse/line/CLineOpMovePoint.cpp
51− mouse/line/CLineOpSelectRange.cpp
52− mouse/line/CScrOptEditLine.cpp
53−- mouse/line/CScrOptRangeLine.cpp
54−+ mouse/line/CScrOptRangeLine.cpp
55− mouse/line/ILineOp.cpp
56− mouse/line/IMouseEditLine.cpp
57− plot/CPlot.cpp
58−@@ -401,7 +401,7 @@ set( HDRS
59− gis/CGisListDB.h
60− gis/CGisListWks.h
61− gis/CGisWorkspace.h
62−- gis/CSelDevices.h
63−+ gis/CSelDevices.h
64− gis/IGisItem.h
65− gis/IGisLine.h
66− gis/Poi.h
67−@@ -512,7 +512,7 @@ set( HDRS
68− gis/trk/CInvalidTrk.h
69− gis/trk/CKnownExtension.h
70− gis/trk/CListTrkPts.h
71−- gis/trk/CPropertyTrk.h
72−+ gis/trk/CPropertyTrk.h
73− gis/trk/CScrOptTrk.h
74− gis/trk/CSelectActivityColor.h
75− gis/trk/CTableTrk.h
76−@@ -579,7 +579,7 @@ set( HDRS
77− map/CMapList.h
78− map/CMapMAP.h
79− map/CMapPathSetup.h
80−- map/CMapPropSetup.h
81−+ map/CMapPropSetup.h
82− map/CMapRMAP.h
83− map/CMapTMS.h
84− map/CMapVRT.h
85−@@ -655,7 +655,7 @@ set( HDRS
86− realtime/CRtSelectSource.h
87− realtime/CRtWorkspace.h
88− realtime/IRtInfo.h
89−- realtime/IRtRecord.h
90−+ realtime/IRtRecord.h
91− realtime/IRtSource.h
92− realtime/gpstether/CRtGpsTether.h
93− realtime/gpstether/CRtGpsTetherInfo.h
94−@@ -764,7 +764,7 @@ set( UIS
95− gis/search/IGeoSearchWebConfigDialog.ui
96− gis/search/ISearchExplanationDialog.ui
97− gis/summary/IGisSummary.ui
98−- gis/summary/IGisSummarySetup.ui
99−+ gis/summary/IGisSummarySetup.ui
100− gis/trk/ICombineTrk.ui
101− gis/trk/ICutTrk.ui
102− gis/trk/IDetailsTrk.ui
103−@@ -818,7 +818,7 @@ set( UIS
104− mouse/range/IActionSelect.ui
105− mouse/range/IRangeToolSetup.ui
106− mouse/range/IScrOptRangeTool.ui
107−- mouse/range/IScrOptRangeTrk.ui
108−+ mouse/range/IScrOptRangeTrk.ui
109− mouse/IScrOptRuler.ui
110− mouse/IScrOptSelect.ui
111− mouse/line/IScrOptEditLine.ui
112−@@ -899,7 +899,6 @@ include_directories(
113− ${PROJ_INCLUDE_DIRS}
114− ${ROUTINO_INCLUDE_DIRS}
115− ${ALGLIB_INCLUDE_DIRS}
116−- ${QUAZIP_INCLUDE_DIRS}
117− )
118−
119− if(APPLE)
120−@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND)
121−
122− target_link_libraries(${APPLICATION_NAME}
123− Qt5::Widgets
124−- Qt5::Xml
125−+ Qt5::Xml
126− Qt5::Sql
127− Qt5::PrintSupport
128−- Qt5::UiTools
129−+ Qt5::UiTools
130− Qt5::Network
131− Qt5::WebEngineWidgets
132− Qt5::Qml
133−@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME}
134− ${PROJ_LIBRARIES}
135− ${ROUTINO_LIBRARIES}
136− ${ALGLIB_LIBRARIES}
137−- ${QUAZIP_LIBRARIES}
138−+ QuaZip::QuaZip
139− )
140−
141− if(APPLE)