Skip to content

Commit 23f8831

Browse files
committed
Get things working/building with 5.11.0
1 parent 80cc5fc commit 23f8831

File tree

8 files changed

+96
-199
lines changed

8 files changed

+96
-199
lines changed

.qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
load(qt_build_config)
2-
MODULE_VERSION = 5.2.0
2+
MODULE_VERSION = 5.11.0

qtcompress.pro.user

Lines changed: 53 additions & 192 deletions
Large diffs are not rendered by default.

src/compress/compress.pro

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ QT = core
33

44
load(qt_module)
55

6+
DEFINES += QT_BUILD_QTCOMPRESS_LIB
7+
68
HEADERS += \
79
qzipreader.h \
8-
qzipwriter.h
10+
qzipwriter.h \
11+
qtcompressglobal.h
912

1013
SOURCES += qzip.cpp
1114

src/compress/qtcompressglobal.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#ifndef QTCOMPRESSGLOBAL_H
2+
#define QTCOMPRESSGLOBAL_H
3+
4+
#include <qglobal.h>
5+
6+
QT_BEGIN_NAMESPACE
7+
8+
#if defined(QT_BUILD_QTCOMPRESS_LIB)
9+
#define QTCOMPRESS_EXPORT Q_DECL_EXPORT
10+
#else
11+
#define QTCOMPRESS_EXPORT Q_DECL_IMPORT
12+
#endif
13+
14+
QT_END_NAMESPACE
15+
16+
#endif // QTCOMPRESSGLOBAL_H

src/compress/qzipreader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#ifndef QZIPREADER_H
4343
#define QZIPREADER_H
4444

45-
#include <QtCore/qglobal.h>
45+
#include <qtcompressglobal.h>
4646

4747
#include <QtCore/qdatetime.h>
4848
#include <QtCore/qfile.h>
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
5252

5353
class QZipReaderPrivate;
5454

55-
class Q_GUI_EXPORT QZipReader
55+
class QTCOMPRESS_EXPORT QZipReader
5656
{
5757
public:
5858
explicit QZipReader(const QString &fileName, QIODevice::OpenMode mode = QIODevice::ReadOnly );
@@ -65,7 +65,7 @@ class Q_GUI_EXPORT QZipReader
6565
bool isReadable() const;
6666
bool exists() const;
6767

68-
struct Q_GUI_EXPORT FileInfo
68+
struct QTCOMPRESS_EXPORT FileInfo
6969
{
7070
FileInfo();
7171
FileInfo(const FileInfo &other);

src/compress/qzipwriter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
#ifndef QZIPWRITER_H
4242
#define QZIPWRITER_H
4343

44-
#include <QtCore/qglobal.h>
44+
#include <qtcompressglobal.h>
4545
#include <QtCore/qstring.h>
4646
#include <QtCore/qfile.h>
4747

4848
QT_BEGIN_NAMESPACE
4949

5050
class QZipWriterPrivate;
5151

52-
class Q_GUI_EXPORT QZipWriter
52+
class QTCOMPRESS_EXPORT QZipWriter
5353
{
5454
public:
5555
explicit QZipWriter(const QString &fileName, QIODevice::OpenMode mode = (QIODevice::WriteOnly | QIODevice::Truncate) );

tests/auto/cmake/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
cmake_minimum_required(VERSION 2.8)
2+
3+
project(qmake_cmake_files)
4+
5+
enable_testing()
6+
7+
find_package(Qt5Core REQUIRED)
8+
9+
include("${_Qt5CTestMacros}")
10+
11+
test_module_includes(
12+
)

tests/auto/cmake/cmake.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
TEMPLATE = subdirs
2+
3+
CMAKE_QT_MODULES_UNDER_TEST = qtcompress
4+
5+
CONFIG += ctest_testcase

0 commit comments

Comments
 (0)