Commit ff8f49c1 authored by Tomasz Buchert's avatar Tomasz Buchert

d/patches: improve the patch

parent 89108dd1
......@@ -6,10 +6,10 @@ This patch is in response to https://bugs.debian.org/786715.
---
src/CMakeLists.txt | 2 +-
src/core/external/qtcompress/qzip.cpp | 18 +++++++++---------
src/core/external/qtcompress/qzipreader.h | 14 ++++++++------
src/core/external/qtcompress/qzipwriter.h | 12 +++++++-----
src/core/external/qtcompress/qzipreader.h | 18 ++++++++++--------
src/core/external/qtcompress/qzipwriter.h | 14 ++++++++------
src/core/modules/LandscapeMgr.cpp | 10 +++++-----
5 files changed, 30 insertions(+), 26 deletions(-)
5 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba76c02..257668e 100644
......@@ -71,10 +71,10 @@ index 2675875..95a15c5 100644
#endif // QT_NO_TEXTODFWRITER
diff --git a/src/core/external/qtcompress/qzipreader.h b/src/core/external/qtcompress/qzipreader.h
index d263191..60635db 100644
index d263191..584de5c 100644
--- a/src/core/external/qtcompress/qzipreader.h
+++ b/src/core/external/qtcompress/qzipreader.h
@@ -42,13 +42,14 @@
@@ -42,17 +42,18 @@
#ifndef QZIPREADER_H
#define QZIPREADER_H
......@@ -94,6 +94,20 @@ index d263191..60635db 100644
class QZipReaderPrivate;
-class Q_GUI_EXPORT QZipReader
+class QZipReader
{
public:
explicit QZipReader(const QString &fileName, QIODevice::OpenMode mode = QIODevice::ReadOnly );
@@ -65,7 +66,7 @@ public:
bool isReadable() const;
bool exists() const;
- struct Q_GUI_EXPORT FileInfo
+ struct FileInfo
{
FileInfo();
FileInfo(const FileInfo &other);
@@ -107,6 +108,7 @@ private:
Q_DISABLE_COPY(QZipReader)
};
......@@ -104,10 +118,10 @@ index d263191..60635db 100644
#endif // QZIPREADER_H
diff --git a/src/core/external/qtcompress/qzipwriter.h b/src/core/external/qtcompress/qzipwriter.h
index b54a8d3..9e6e78c 100644
index b54a8d3..1d304b0 100644
--- a/src/core/external/qtcompress/qzipwriter.h
+++ b/src/core/external/qtcompress/qzipwriter.h
@@ -41,11 +41,12 @@
@@ -41,15 +41,16 @@
#ifndef QZIPWRITER_H
#define QZIPWRITER_H
......@@ -124,6 +138,11 @@ index b54a8d3..9e6e78c 100644
class QZipWriterPrivate;
-class Q_GUI_EXPORT QZipWriter
+class QZipWriter
{
public:
explicit QZipWriter(const QString &fileName, QIODevice::OpenMode mode = (QIODevice::WriteOnly | QIODevice::Truncate) );
@@ -98,6 +99,7 @@ private:
Q_DISABLE_COPY(QZipWriter)
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment