update v2

2025-01-16 04:42:53 +08:00 · 2017-09-08 21:42:43 +09:00 · 2017-09-08 21:42:43 +09:00 · 9fb4e43559
commit 9fb4e43559
parent 712a42291e
45 changed files with 3 additions and 3 deletions
--- a/QtXlsxWriter-Static/include/xlsxabstractooxmlfile.h
+++ b/QtXlsxWriter-Static/include/xlsxabstractooxmlfile.h
--- a/QtXlsxWriter-Static/include/xlsxabstractooxmlfile_p.h
+++ b/QtXlsxWriter-Static/include/xlsxabstractooxmlfile_p.h
--- a/QtXlsxWriter-Static/include/xlsxabstractsheet.h
+++ b/QtXlsxWriter-Static/include/xlsxabstractsheet.h
--- a/QtXlsxWriter-Static/include/xlsxabstractsheet_p.h
+++ b/QtXlsxWriter-Static/include/xlsxabstractsheet_p.h
--- a/QtXlsxWriter-Static/include/xlsxcell.h
+++ b/QtXlsxWriter-Static/include/xlsxcell.h
--- a/QtXlsxWriter-Static/include/xlsxcell_p.h
+++ b/QtXlsxWriter-Static/include/xlsxcell_p.h
--- a/QtXlsxWriter-Static/include/xlsxcellformula.h
+++ b/QtXlsxWriter-Static/include/xlsxcellformula.h
--- a/QtXlsxWriter-Static/include/xlsxcellformula_p.h
+++ b/QtXlsxWriter-Static/include/xlsxcellformula_p.h
--- a/QtXlsxWriter-Static/include/xlsxcellrange.h
+++ b/QtXlsxWriter-Static/include/xlsxcellrange.h
--- a/QtXlsxWriter-Static/include/xlsxcellreference.h
+++ b/QtXlsxWriter-Static/include/xlsxcellreference.h
--- a/QtXlsxWriter-Static/include/xlsxchart.h
+++ b/QtXlsxWriter-Static/include/xlsxchart.h
--- a/QtXlsxWriter-Static/include/xlsxchart_p.h
+++ b/QtXlsxWriter-Static/include/xlsxchart_p.h
--- a/QtXlsxWriter-Static/include/xlsxchartsheet.h
+++ b/QtXlsxWriter-Static/include/xlsxchartsheet.h
--- a/QtXlsxWriter-Static/include/xlsxchartsheet_p.h
+++ b/QtXlsxWriter-Static/include/xlsxchartsheet_p.h
--- a/QtXlsxWriter-Static/include/xlsxcolor_p.h
+++ b/QtXlsxWriter-Static/include/xlsxcolor_p.h
--- a/QtXlsxWriter-Static/include/xlsxconditionalformatting.h
+++ b/QtXlsxWriter-Static/include/xlsxconditionalformatting.h
--- a/QtXlsxWriter-Static/include/xlsxconditionalformatting_p.h
+++ b/QtXlsxWriter-Static/include/xlsxconditionalformatting_p.h
--- a/QtXlsxWriter-Static/include/xlsxcontenttypes_p.h
+++ b/QtXlsxWriter-Static/include/xlsxcontenttypes_p.h
--- a/QtXlsxWriter-Static/include/xlsxdatavalidation.h
+++ b/QtXlsxWriter-Static/include/xlsxdatavalidation.h
--- a/QtXlsxWriter-Static/include/xlsxdatavalidation_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdatavalidation_p.h
--- a/QtXlsxWriter-Static/include/xlsxdocpropsapp_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdocpropsapp_p.h
--- a/QtXlsxWriter-Static/include/xlsxdocpropscore_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdocpropscore_p.h
--- a/QtXlsxWriter-Static/include/xlsxdocument.h
+++ b/QtXlsxWriter-Static/include/xlsxdocument.h
--- a/QtXlsxWriter-Static/include/xlsxdocument_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdocument_p.h
--- a/QtXlsxWriter-Static/include/xlsxdrawing_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdrawing_p.h
--- a/QtXlsxWriter-Static/include/xlsxdrawinganchor_p.h
+++ b/QtXlsxWriter-Static/include/xlsxdrawinganchor_p.h
--- a/QtXlsxWriter-Static/include/xlsxformat.h
+++ b/QtXlsxWriter-Static/include/xlsxformat.h
--- a/QtXlsxWriter-Static/include/xlsxformat_p.h
+++ b/QtXlsxWriter-Static/include/xlsxformat_p.h
--- a/QtXlsxWriter-Static/include/xlsxglobal.h
+++ b/QtXlsxWriter-Static/include/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
--- a/QtXlsxWriter-Static/include/xlsxmediafile_p.h
+++ b/QtXlsxWriter-Static/include/xlsxmediafile_p.h
--- a/QtXlsxWriter-Static/include/xlsxnumformatparser_p.h
+++ b/QtXlsxWriter-Static/include/xlsxnumformatparser_p.h
--- a/QtXlsxWriter-Static/include/xlsxrelationships_p.h
+++ b/QtXlsxWriter-Static/include/xlsxrelationships_p.h
--- a/QtXlsxWriter-Static/include/xlsxrichstring.h
+++ b/QtXlsxWriter-Static/include/xlsxrichstring.h
--- a/QtXlsxWriter-Static/include/xlsxrichstring_p.h
+++ b/QtXlsxWriter-Static/include/xlsxrichstring_p.h
--- a/QtXlsxWriter-Static/include/xlsxsharedstrings_p.h
+++ b/QtXlsxWriter-Static/include/xlsxsharedstrings_p.h
--- a/QtXlsxWriter-Static/include/xlsxsimpleooxmlfile_p.h
+++ b/QtXlsxWriter-Static/include/xlsxsimpleooxmlfile_p.h
--- a/QtXlsxWriter-Static/include/xlsxstyles_p.h
+++ b/QtXlsxWriter-Static/include/xlsxstyles_p.h
--- a/QtXlsxWriter-Static/include/xlsxtheme_p.h
+++ b/QtXlsxWriter-Static/include/xlsxtheme_p.h
--- a/QtXlsxWriter-Static/include/xlsxutility_p.h
+++ b/QtXlsxWriter-Static/include/xlsxutility_p.h
--- a/QtXlsxWriter-Static/include/xlsxworkbook.h
+++ b/QtXlsxWriter-Static/include/xlsxworkbook.h
--- a/QtXlsxWriter-Static/include/xlsxworkbook_p.h
+++ b/QtXlsxWriter-Static/include/xlsxworkbook_p.h
--- a/QtXlsxWriter-Static/include/xlsxworksheet.h
+++ b/QtXlsxWriter-Static/include/xlsxworksheet.h
--- a/QtXlsxWriter-Static/include/xlsxworksheet_p.h
+++ b/QtXlsxWriter-Static/include/xlsxworksheet_p.h
--- a/QtXlsxWriter-Static/include/xlsxzipreader_p.h
+++ b/QtXlsxWriter-Static/include/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;

--- a/QtXlsxWriter-Static/include/xlsxzipwriter_p.h
+++ b/QtXlsxWriter-Static/include/xlsxzipwriter_p.h