Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CMakeList and change QList to QVector in xlsxzipreader #155

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add CMakeList and change QList to QVector in xlsxzipreader #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a12dfb
Create CMakeLists.txt
T4ng10r Apr 15, 2017
d5806fe
Update xlsxzipreader.cpp
T4ng10r Apr 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
project(QtXlsx)

include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
set(CMAKE_AUTOMOC ON)

FILE(GLOB PROJECT_SRCS src/xlsx/*.cpp src/xlsx/*.h)

add_library(${PROJECT_NAME}_lib STATIC ${PROJECT_SRCS})

target_link_libraries(${PROJECT_NAME}_lib
Qt5::Core Qt5::Widgets)
3 changes: 2 additions & 1 deletion src/xlsx/xlsxzipreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "xlsxzipreader_p.h"

#include <private/qzipreader_p.h>
#include <QVector>

namespace QXlsx {

Expand All @@ -48,7 +49,7 @@ ZipReader::~ZipReader()

void ZipReader::init()
{
QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
QVector<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
foreach (const QZipReader::FileInfo &fi, allFiles) {
if (fi.isFile)
m_filePaths.append(fi.filePath);
Expand Down