From 14f18c83177b34077d3472db35afea43ce768b34 Mon Sep 17 00:00:00 2001 From: Olivier Delbeke Date: Sat, 13 Feb 2016 17:37:01 +0100 Subject: [PATCH] Made the project compatible with Qt 5.6 --- src/xlsx/xlsxzipreader.cpp | 4 ++++ src/xlsx/xlsxzipreader_p.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/xlsx/xlsxzipreader.cpp b/src/xlsx/xlsxzipreader.cpp index 7b63a98..2bf12e5 100644 --- a/src/xlsx/xlsxzipreader.cpp +++ b/src/xlsx/xlsxzipreader.cpp @@ -48,7 +48,11 @@ ZipReader::~ZipReader() void ZipReader::init() { +#if QT_VERSION >= 0x050600 + QVector allFiles = m_reader->fileInfoList(); +#else QList allFiles = m_reader->fileInfoList(); +#endif foreach (const QZipReader::FileInfo &fi, allFiles) { if (fi.isFile) m_filePaths.append(fi.filePath); diff --git a/src/xlsx/xlsxzipreader_p.h b/src/xlsx/xlsxzipreader_p.h index 32ed59c..bc094b6 100644 --- a/src/xlsx/xlsxzipreader_p.h +++ b/src/xlsx/xlsxzipreader_p.h @@ -40,6 +40,9 @@ #include "xlsxglobal.h" #include #include +#if QT_VERSION >= 0x050600 +#include +#endif class QZipReader; class QIODevice;