From 9fb4e43559472b2177da5fef12adbd53cc55b5a4 Mon Sep 17 00:00:00 2001
From: unknown <j2doll@gmail.com>
Date: Fri, 8 Sep 2017 21:42:43 +0900
Subject: [PATCH]  update v2

---
 .../{include => header}/xlsxabstractooxmlfile.h                | 0
 .../{include => header}/xlsxabstractooxmlfile_p.h              | 0
 QtXlsxWriter-Static/{include => header}/xlsxabstractsheet.h    | 0
 QtXlsxWriter-Static/{include => header}/xlsxabstractsheet_p.h  | 0
 QtXlsxWriter-Static/{include => header}/xlsxcell.h             | 0
 QtXlsxWriter-Static/{include => header}/xlsxcell_p.h           | 0
 QtXlsxWriter-Static/{include => header}/xlsxcellformula.h      | 0
 QtXlsxWriter-Static/{include => header}/xlsxcellformula_p.h    | 0
 QtXlsxWriter-Static/{include => header}/xlsxcellrange.h        | 0
 QtXlsxWriter-Static/{include => header}/xlsxcellreference.h    | 0
 QtXlsxWriter-Static/{include => header}/xlsxchart.h            | 0
 QtXlsxWriter-Static/{include => header}/xlsxchart_p.h          | 0
 QtXlsxWriter-Static/{include => header}/xlsxchartsheet.h       | 0
 QtXlsxWriter-Static/{include => header}/xlsxchartsheet_p.h     | 0
 QtXlsxWriter-Static/{include => header}/xlsxcolor_p.h          | 0
 .../{include => header}/xlsxconditionalformatting.h            | 0
 .../{include => header}/xlsxconditionalformatting_p.h          | 0
 QtXlsxWriter-Static/{include => header}/xlsxcontenttypes_p.h   | 0
 QtXlsxWriter-Static/{include => header}/xlsxdatavalidation.h   | 0
 QtXlsxWriter-Static/{include => header}/xlsxdatavalidation_p.h | 0
 QtXlsxWriter-Static/{include => header}/xlsxdocpropsapp_p.h    | 0
 QtXlsxWriter-Static/{include => header}/xlsxdocpropscore_p.h   | 0
 QtXlsxWriter-Static/{include => header}/xlsxdocument.h         | 0
 QtXlsxWriter-Static/{include => header}/xlsxdocument_p.h       | 0
 QtXlsxWriter-Static/{include => header}/xlsxdrawing_p.h        | 0
 QtXlsxWriter-Static/{include => header}/xlsxdrawinganchor_p.h  | 0
 QtXlsxWriter-Static/{include => header}/xlsxformat.h           | 0
 QtXlsxWriter-Static/{include => header}/xlsxformat_p.h         | 0
 QtXlsxWriter-Static/{include => header}/xlsxglobal.h           | 3 ---
 QtXlsxWriter-Static/{include => header}/xlsxmediafile_p.h      | 0
 .../{include => header}/xlsxnumformatparser_p.h                | 0
 QtXlsxWriter-Static/{include => header}/xlsxrelationships_p.h  | 0
 QtXlsxWriter-Static/{include => header}/xlsxrichstring.h       | 0
 QtXlsxWriter-Static/{include => header}/xlsxrichstring_p.h     | 0
 QtXlsxWriter-Static/{include => header}/xlsxsharedstrings_p.h  | 0
 .../{include => header}/xlsxsimpleooxmlfile_p.h                | 0
 QtXlsxWriter-Static/{include => header}/xlsxstyles_p.h         | 0
 QtXlsxWriter-Static/{include => header}/xlsxtheme_p.h          | 0
 QtXlsxWriter-Static/{include => header}/xlsxutility_p.h        | 0
 QtXlsxWriter-Static/{include => header}/xlsxworkbook.h         | 0
 QtXlsxWriter-Static/{include => header}/xlsxworkbook_p.h       | 0
 QtXlsxWriter-Static/{include => header}/xlsxworksheet.h        | 0
 QtXlsxWriter-Static/{include => header}/xlsxworksheet_p.h      | 0
 QtXlsxWriter-Static/{include => header}/xlsxzipreader_p.h      | 3 +++
 QtXlsxWriter-Static/{include => header}/xlsxzipwriter_p.h      | 0
 45 files changed, 3 insertions(+), 3 deletions(-)
 rename QtXlsxWriter-Static/{include => header}/xlsxabstractooxmlfile.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxabstractooxmlfile_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxabstractsheet.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxabstractsheet_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcell.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcell_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcellformula.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcellformula_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcellrange.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcellreference.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxchart.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxchart_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxchartsheet.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxchartsheet_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcolor_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxconditionalformatting.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxconditionalformatting_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxcontenttypes_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdatavalidation.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdatavalidation_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdocpropsapp_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdocpropscore_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdocument.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdocument_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdrawing_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxdrawinganchor_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxformat.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxformat_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxglobal.h (98%)
 rename QtXlsxWriter-Static/{include => header}/xlsxmediafile_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxnumformatparser_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxrelationships_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxrichstring.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxrichstring_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxsharedstrings_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxsimpleooxmlfile_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxstyles_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxtheme_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxutility_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxworkbook.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxworkbook_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxworksheet.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxworksheet_p.h (100%)
 rename QtXlsxWriter-Static/{include => header}/xlsxzipreader_p.h (97%)
 rename QtXlsxWriter-Static/{include => header}/xlsxzipwriter_p.h (100%)

diff --git a/QtXlsxWriter-Static/include/xlsxabstractooxmlfile.h b/QtXlsxWriter-Static/header/xlsxabstractooxmlfile.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxabstractooxmlfile.h
rename to QtXlsxWriter-Static/header/xlsxabstractooxmlfile.h
diff --git a/QtXlsxWriter-Static/include/xlsxabstractooxmlfile_p.h b/QtXlsxWriter-Static/header/xlsxabstractooxmlfile_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxabstractooxmlfile_p.h
rename to QtXlsxWriter-Static/header/xlsxabstractooxmlfile_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxabstractsheet.h b/QtXlsxWriter-Static/header/xlsxabstractsheet.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxabstractsheet.h
rename to QtXlsxWriter-Static/header/xlsxabstractsheet.h
diff --git a/QtXlsxWriter-Static/include/xlsxabstractsheet_p.h b/QtXlsxWriter-Static/header/xlsxabstractsheet_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxabstractsheet_p.h
rename to QtXlsxWriter-Static/header/xlsxabstractsheet_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxcell.h b/QtXlsxWriter-Static/header/xlsxcell.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcell.h
rename to QtXlsxWriter-Static/header/xlsxcell.h
diff --git a/QtXlsxWriter-Static/include/xlsxcell_p.h b/QtXlsxWriter-Static/header/xlsxcell_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcell_p.h
rename to QtXlsxWriter-Static/header/xlsxcell_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxcellformula.h b/QtXlsxWriter-Static/header/xlsxcellformula.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcellformula.h
rename to QtXlsxWriter-Static/header/xlsxcellformula.h
diff --git a/QtXlsxWriter-Static/include/xlsxcellformula_p.h b/QtXlsxWriter-Static/header/xlsxcellformula_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcellformula_p.h
rename to QtXlsxWriter-Static/header/xlsxcellformula_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxcellrange.h b/QtXlsxWriter-Static/header/xlsxcellrange.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcellrange.h
rename to QtXlsxWriter-Static/header/xlsxcellrange.h
diff --git a/QtXlsxWriter-Static/include/xlsxcellreference.h b/QtXlsxWriter-Static/header/xlsxcellreference.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcellreference.h
rename to QtXlsxWriter-Static/header/xlsxcellreference.h
diff --git a/QtXlsxWriter-Static/include/xlsxchart.h b/QtXlsxWriter-Static/header/xlsxchart.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxchart.h
rename to QtXlsxWriter-Static/header/xlsxchart.h
diff --git a/QtXlsxWriter-Static/include/xlsxchart_p.h b/QtXlsxWriter-Static/header/xlsxchart_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxchart_p.h
rename to QtXlsxWriter-Static/header/xlsxchart_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxchartsheet.h b/QtXlsxWriter-Static/header/xlsxchartsheet.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxchartsheet.h
rename to QtXlsxWriter-Static/header/xlsxchartsheet.h
diff --git a/QtXlsxWriter-Static/include/xlsxchartsheet_p.h b/QtXlsxWriter-Static/header/xlsxchartsheet_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxchartsheet_p.h
rename to QtXlsxWriter-Static/header/xlsxchartsheet_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxcolor_p.h b/QtXlsxWriter-Static/header/xlsxcolor_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcolor_p.h
rename to QtXlsxWriter-Static/header/xlsxcolor_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxconditionalformatting.h b/QtXlsxWriter-Static/header/xlsxconditionalformatting.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxconditionalformatting.h
rename to QtXlsxWriter-Static/header/xlsxconditionalformatting.h
diff --git a/QtXlsxWriter-Static/include/xlsxconditionalformatting_p.h b/QtXlsxWriter-Static/header/xlsxconditionalformatting_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxconditionalformatting_p.h
rename to QtXlsxWriter-Static/header/xlsxconditionalformatting_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxcontenttypes_p.h b/QtXlsxWriter-Static/header/xlsxcontenttypes_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxcontenttypes_p.h
rename to QtXlsxWriter-Static/header/xlsxcontenttypes_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdatavalidation.h b/QtXlsxWriter-Static/header/xlsxdatavalidation.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdatavalidation.h
rename to QtXlsxWriter-Static/header/xlsxdatavalidation.h
diff --git a/QtXlsxWriter-Static/include/xlsxdatavalidation_p.h b/QtXlsxWriter-Static/header/xlsxdatavalidation_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdatavalidation_p.h
rename to QtXlsxWriter-Static/header/xlsxdatavalidation_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdocpropsapp_p.h b/QtXlsxWriter-Static/header/xlsxdocpropsapp_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdocpropsapp_p.h
rename to QtXlsxWriter-Static/header/xlsxdocpropsapp_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdocpropscore_p.h b/QtXlsxWriter-Static/header/xlsxdocpropscore_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdocpropscore_p.h
rename to QtXlsxWriter-Static/header/xlsxdocpropscore_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdocument.h b/QtXlsxWriter-Static/header/xlsxdocument.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdocument.h
rename to QtXlsxWriter-Static/header/xlsxdocument.h
diff --git a/QtXlsxWriter-Static/include/xlsxdocument_p.h b/QtXlsxWriter-Static/header/xlsxdocument_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdocument_p.h
rename to QtXlsxWriter-Static/header/xlsxdocument_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdrawing_p.h b/QtXlsxWriter-Static/header/xlsxdrawing_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdrawing_p.h
rename to QtXlsxWriter-Static/header/xlsxdrawing_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxdrawinganchor_p.h b/QtXlsxWriter-Static/header/xlsxdrawinganchor_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxdrawinganchor_p.h
rename to QtXlsxWriter-Static/header/xlsxdrawinganchor_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxformat.h b/QtXlsxWriter-Static/header/xlsxformat.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxformat.h
rename to QtXlsxWriter-Static/header/xlsxformat.h
diff --git a/QtXlsxWriter-Static/include/xlsxformat_p.h b/QtXlsxWriter-Static/header/xlsxformat_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxformat_p.h
rename to QtXlsxWriter-Static/header/xlsxformat_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxglobal.h b/QtXlsxWriter-Static/header/xlsxglobal.h
similarity index 98%
rename from QtXlsxWriter-Static/include/xlsxglobal.h
rename to QtXlsxWriter-Static/header/xlsxglobal.h
index 962648d..1e5f4a6 100644
--- a/QtXlsxWriter-Static/include/xlsxglobal.h
+++ b/QtXlsxWriter-Static/header/xlsxglobal.h
@@ -30,7 +30,6 @@
 #define QT_END_NAMESPACE_XLSX }
 #define QTXLSX_USE_NAMESPACE using namespace QXlsx;
 
-/*
 #if !defined(QT_STATIC) && !defined(XLSX_NO_LIB)
 #  if defined(QT_BUILD_XLSX_LIB)
 #    define Q_XLSX_EXPORT Q_DECL_EXPORT
@@ -40,8 +39,6 @@
 #else
 #  define Q_XLSX_EXPORT
 #endif
-*/
-#define Q_XLSX_EXPORT
 
 #ifdef XLSX_TEST
 #  define XLSX_AUTOTEST_EXPORT Q_XLSX_EXPORT
diff --git a/QtXlsxWriter-Static/include/xlsxmediafile_p.h b/QtXlsxWriter-Static/header/xlsxmediafile_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxmediafile_p.h
rename to QtXlsxWriter-Static/header/xlsxmediafile_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxnumformatparser_p.h b/QtXlsxWriter-Static/header/xlsxnumformatparser_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxnumformatparser_p.h
rename to QtXlsxWriter-Static/header/xlsxnumformatparser_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxrelationships_p.h b/QtXlsxWriter-Static/header/xlsxrelationships_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxrelationships_p.h
rename to QtXlsxWriter-Static/header/xlsxrelationships_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxrichstring.h b/QtXlsxWriter-Static/header/xlsxrichstring.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxrichstring.h
rename to QtXlsxWriter-Static/header/xlsxrichstring.h
diff --git a/QtXlsxWriter-Static/include/xlsxrichstring_p.h b/QtXlsxWriter-Static/header/xlsxrichstring_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxrichstring_p.h
rename to QtXlsxWriter-Static/header/xlsxrichstring_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxsharedstrings_p.h b/QtXlsxWriter-Static/header/xlsxsharedstrings_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxsharedstrings_p.h
rename to QtXlsxWriter-Static/header/xlsxsharedstrings_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxsimpleooxmlfile_p.h b/QtXlsxWriter-Static/header/xlsxsimpleooxmlfile_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxsimpleooxmlfile_p.h
rename to QtXlsxWriter-Static/header/xlsxsimpleooxmlfile_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxstyles_p.h b/QtXlsxWriter-Static/header/xlsxstyles_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxstyles_p.h
rename to QtXlsxWriter-Static/header/xlsxstyles_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxtheme_p.h b/QtXlsxWriter-Static/header/xlsxtheme_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxtheme_p.h
rename to QtXlsxWriter-Static/header/xlsxtheme_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxutility_p.h b/QtXlsxWriter-Static/header/xlsxutility_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxutility_p.h
rename to QtXlsxWriter-Static/header/xlsxutility_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxworkbook.h b/QtXlsxWriter-Static/header/xlsxworkbook.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxworkbook.h
rename to QtXlsxWriter-Static/header/xlsxworkbook.h
diff --git a/QtXlsxWriter-Static/include/xlsxworkbook_p.h b/QtXlsxWriter-Static/header/xlsxworkbook_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxworkbook_p.h
rename to QtXlsxWriter-Static/header/xlsxworkbook_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxworksheet.h b/QtXlsxWriter-Static/header/xlsxworksheet.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxworksheet.h
rename to QtXlsxWriter-Static/header/xlsxworksheet.h
diff --git a/QtXlsxWriter-Static/include/xlsxworksheet_p.h b/QtXlsxWriter-Static/header/xlsxworksheet_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxworksheet_p.h
rename to QtXlsxWriter-Static/header/xlsxworksheet_p.h
diff --git a/QtXlsxWriter-Static/include/xlsxzipreader_p.h b/QtXlsxWriter-Static/header/xlsxzipreader_p.h
similarity index 97%
rename from QtXlsxWriter-Static/include/xlsxzipreader_p.h
rename to QtXlsxWriter-Static/header/xlsxzipreader_p.h
index 32ed59c..bc094b6 100644
--- a/QtXlsxWriter-Static/include/xlsxzipreader_p.h
+++ b/QtXlsxWriter-Static/header/xlsxzipreader_p.h
@@ -40,6 +40,9 @@
 #include "xlsxglobal.h"
 #include <QScopedPointer>
 #include <QStringList>
+#if QT_VERSION >= 0x050600
+#include <QVector>
+#endif
 class QZipReader;
 class QIODevice;
 
diff --git a/QtXlsxWriter-Static/include/xlsxzipwriter_p.h b/QtXlsxWriter-Static/header/xlsxzipwriter_p.h
similarity index 100%
rename from QtXlsxWriter-Static/include/xlsxzipwriter_p.h
rename to QtXlsxWriter-Static/header/xlsxzipwriter_p.h