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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
MESSAGE(STATUS "GPS: disabled.")
ENDIF(ENABLE_GPS)
+find_package(Qt5Compress REQUIRED)
IF(USE_QTOPENGL)
# QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
--- a/plugins/Satellites/src/CMakeLists.txt
+++ b/plugins/Satellites/src/CMakeLists.txt
@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
ENDIF(ENABLE_TESTING)
ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
# The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
IF(MSVC)
--- a/plugins/Satellites/src/Satellites.cpp
+++ b/plugins/Satellites/src/Satellites.cpp
@@ -43,7 +43,7 @@
#include "StelUtils.hpp"
#include "StelActionMgr.hpp"
-#include "external/qtcompress/qzipreader.h"
+#include "qzipreader.h"
#include <QNetworkAccessManager>
#include <QNetworkReply>
@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
QString archive = zip.fileName();
QByteArray data;
- Stel::QZipReader reader(archive);
- if (reader.status() != Stel::QZipReader::NoError)
+ QZipReader reader(archive);
+ if (reader.status() != QZipReader::NoError)
qWarning() << "[Satellites] Unable to open as a ZIP archive";
else
{
- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
for (const auto& info : qAsConst(infoList))
{
// qWarning() << "[Satellites] Processing:" << info.filePath;
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
ENDIF()
-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
IF(ENABLE_LIBGPS)
SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
ENDIF()
--- a/src/core/modules/LandscapeMgr.cpp
+++ b/src/core/modules/LandscapeMgr.cpp
@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
}
QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
- Stel::QZipReader reader(sourceFilePath);
- if (reader.status() != Stel::QZipReader::NoError)
+ QZipReader reader(sourceFilePath);
+ if (reader.status() != QZipReader::NoError)
{
qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
emit errorNotArchive();
@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
//Detect top directory
QString topDir, iniPath;
- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
for (const auto& info : infoList)
{
QFileInfo fileInfo(info.filePath);
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+if(0)
set(qtcompress_SRCS
qtcompress/qzip.cpp
qtcompress/qzipreader.h
@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
#turn off automoc, not needed here
set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
+endif()
# QCustomPlot should not be unbundled, because upstream uses GPL 3, and
# Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.
@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
qxlsx/xlsxcelllocation.h
)
add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
################################# INDI ################################
--- a/src/external/qxlsx/xlsxzipreader.cpp
+++ b/src/external/qxlsx/xlsxzipreader.cpp
@@ -5,13 +5,13 @@
QT_BEGIN_NAMESPACE_XLSX
ZipReader::ZipReader(const QString &filePath) :
- m_reader(new Stel::QZipReader(filePath))
+ m_reader(new QZipReader(filePath))
{
init();
}
ZipReader::ZipReader(QIODevice *device) :
- m_reader(new Stel::QZipReader(device))
+ m_reader(new QZipReader(device))
{
init();
}
@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
void ZipReader::init()
{
- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
- for (const Stel::QZipReader::FileInfo &fi : allFiles) {
+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+ for (const QZipReader::FileInfo &fi : allFiles) {
if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
m_filePaths.append(fi.filePath);
}
--- a/src/external/qxlsx/xlsxzipreader_p.h
+++ b/src/external/qxlsx/xlsxzipreader_p.h
@@ -8,7 +8,7 @@
#include <QIODevice>
#include "xlsxglobal.h"
-#include "external/qtcompress/qzipreader.h"
+#include "qzipreader.h"
#if QT_VERSION >= 0x050600
#include <QVector>
@@ -31,7 +31,7 @@ public:
private:
Q_DISABLE_COPY(ZipReader)
void init();
- QScopedPointer<Stel::QZipReader> m_reader;
+ QScopedPointer<QZipReader> m_reader;
QStringList m_filePaths;
};
--- a/src/external/qxlsx/xlsxzipwriter.cpp
+++ b/src/external/qxlsx/xlsxzipwriter.cpp
@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
ZipWriter::ZipWriter(const QString &filePath)
{
- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
}
ZipWriter::ZipWriter(QIODevice *device)
{
- m_writer = new Stel::QZipWriter(device);
- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
+ m_writer = new QZipWriter(device);
+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
}
ZipWriter::~ZipWriter()
@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
bool ZipWriter::error() const
{
- return m_writer->status() != Stel::QZipWriter::NoError;
+ return m_writer->status() != QZipWriter::NoError;
}
void ZipWriter::addFile(const QString &filePath, QIODevice *device)
--- a/src/external/qxlsx/xlsxzipwriter_p.h
+++ b/src/external/qxlsx/xlsxzipwriter_p.h
@@ -8,7 +8,7 @@
#include <QIODevice>
#include "xlsxglobal.h"
-#include "external/qtcompress/qzipwriter.h"
+#include "qzipwriter.h"
class QZipWriter;
@@ -27,7 +27,7 @@ public:
void close();
private:
- Stel::QZipWriter *m_writer;
+ QZipWriter *m_writer;
};
QT_END_NAMESPACE_XLSX
|
