Merge pull request #145 from QtExcel/qt6beta

Qt6beta

.github/workflows/ubuntu.yml

@@ -37,6 +37,7 @@ jobs:
     steps:
       - name: Install Qt
         run : |
+          sudo apt-get update -y
           sudo apt-get install build-essential libfontconfig1 mesa-common-dev libglu1-mesa-dev cmake qtdeclarative5-dev qml-module-qtquick-controls qtbase5-dev qtcreator qt5-default libqt5serialport5-dev qtbase5-private-dev qtdeclarative5-private-dev mesa-common-dev -y
       - uses: actions/checkout@v1
         with:

HowToSetProject-cmake.ko.md

@@ -2,9 +2,9 @@
 
 > *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
 
-:one: 아래와 같은 명령어들읋 입력하세요.
+- 다음과 같은 명령어들을 입력하세요. 
 
-:two: MingW 사용하기
+:one: MingW 사용하기
 
 - QXlsx 라이브러리
 
@@ -24,6 +24,28 @@ cmake -G "MinGW Makefiles" ..\HelloWorld\
 mingw32-make
 ```
 
+:two: Visual Studio 사용하기
+
+- QXlsx 라이브러리 (Release Build)
+
+```
+mkdir build
+cd build
+cmake -G "Visual Studio 16 2019" ..\QXlsx\
+MSBuild /nologo /t:Build /p:Configuration=Release QXlsx.vcxproj
+```
+
+- HelloWorld (Release Build)
+
+```
+mkdir build2
+cd build2
+cmake -G "Visual Studio 16 2019" ..\HelloWorld\
+MSBuild /nologo /t:Build /p:Configuration=Release HelloWorld.vcxproj 
+```
+
+- 또는, *.sln/*.vcxproj 파일들을 Visual Studio IDE에서 열어도 됩니다.
+
 :three: Linux/Mac/Unix 사용하기
 
 - QXlsx 라이브러리

HowToSetProject-cmake.md

@@ -2,9 +2,9 @@
 
 > *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
 
-:one: Enter the command as shown below.
+- Enter the command as shown below.
 
-:two: Using MingW
+:one: Using MingW
 
 - QXlsx library
 
@@ -24,6 +24,27 @@ cmake -G "MinGW Makefiles" ..\HelloWorld\
 mingw32-make
 ```
 
+:two: Using Visual Studio
+
+- QXlsx library (Release Build)
+
+```
+mkdir build
+cd build
+cmake -G "Visual Studio 16 2019" ..\QXlsx\
+MSBuild /nologo /t:Build /p:Configuration=Release QXlsx.vcxproj
+```
+
+- HelloWorld (Release Build)
+
+```
+mkdir build2
+cd build2
+cmake -G "Visual Studio 16 2019" ..\HelloWorld\
+MSBuild /nologo /t:Build /p:Configuration=Release HelloWorld.vcxproj 
+```
+
+- Or, You may open *.sln/*.vcxproj files in Visual Studio IDE.
 
 :three: Using Linux/Mac/Unix
 

QXlsx/QXlsx.pri

@@ -1,8 +1,11 @@
+########################################
 # QXlsx.pri
+########################################
 
 QT += core
 QT += gui-private
 
+# TODO: Define your C++ version. c++14, c++17, etc.
 CONFIG += c++11
 
 # The following define makes your compiler emit warnings if you use
@@ -44,95 +47,13 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $${QXLSX_PARENTPATH}
 INCLUDEPATH += $${QXLSX_HEADERPATH}
 
-######################################################################
+########################################
 # source code 
 
-HEADERS += \
-$${QXLSX_HEADERPATH}xlsxabstractooxmlfile.h \
-$${QXLSX_HEADERPATH}xlsxabstractooxmlfile_p.h \
-$${QXLSX_HEADERPATH}xlsxabstractsheet.h \
-$${QXLSX_HEADERPATH}xlsxabstractsheet_p.h \
-$${QXLSX_HEADERPATH}xlsxcell.h \
-$${QXLSX_HEADERPATH}xlsxcellformula.h \
-$${QXLSX_HEADERPATH}xlsxcellformula_p.h \
-$${QXLSX_HEADERPATH}xlsxcellrange.h \
-$${QXLSX_HEADERPATH}xlsxcellreference.h \
-$${QXLSX_HEADERPATH}xlsxcell_p.h \
-$${QXLSX_HEADERPATH}xlsxchart.h \
-$${QXLSX_HEADERPATH}xlsxchartsheet.h \
-$${QXLSX_HEADERPATH}xlsxchartsheet_p.h \
-$${QXLSX_HEADERPATH}xlsxchart_p.h \
-$${QXLSX_HEADERPATH}xlsxcolor_p.h \
-$${QXLSX_HEADERPATH}xlsxconditionalformatting.h \
-$${QXLSX_HEADERPATH}xlsxconditionalformatting_p.h \
-$${QXLSX_HEADERPATH}xlsxcontenttypes_p.h \
-$${QXLSX_HEADERPATH}xlsxdatavalidation.h \
-$${QXLSX_HEADERPATH}xlsxdatavalidation_p.h \
-$${QXLSX_HEADERPATH}xlsxdocpropsapp_p.h \
-$${QXLSX_HEADERPATH}xlsxdocpropscore_p.h \
-$${QXLSX_HEADERPATH}xlsxdocument.h \
-$${QXLSX_HEADERPATH}xlsxdocument_p.h \
-$${QXLSX_HEADERPATH}xlsxdrawinganchor_p.h \
-$${QXLSX_HEADERPATH}xlsxdrawing_p.h \
-$${QXLSX_HEADERPATH}xlsxformat.h \
-$${QXLSX_HEADERPATH}xlsxformat_p.h \
-$${QXLSX_HEADERPATH}xlsxglobal.h \
-$${QXLSX_HEADERPATH}xlsxmediafile_p.h \
-$${QXLSX_HEADERPATH}xlsxnumformatparser_p.h \
-$${QXLSX_HEADERPATH}xlsxrelationships_p.h \
-$${QXLSX_HEADERPATH}xlsxrichstring.h \
-$${QXLSX_HEADERPATH}xlsxrichstring_p.h \
-$${QXLSX_HEADERPATH}xlsxsharedstrings_p.h \
-$${QXLSX_HEADERPATH}xlsxsimpleooxmlfile_p.h \
-$${QXLSX_HEADERPATH}xlsxstyles_p.h \
-$${QXLSX_HEADERPATH}xlsxtheme_p.h \
-$${QXLSX_HEADERPATH}xlsxutility_p.h \
-$${QXLSX_HEADERPATH}xlsxworkbook.h \
-$${QXLSX_HEADERPATH}xlsxworkbook_p.h \
-$${QXLSX_HEADERPATH}xlsxworksheet.h \
-$${QXLSX_HEADERPATH}xlsxworksheet_p.h \
-$${QXLSX_HEADERPATH}xlsxzipreader_p.h \
-$${QXLSX_HEADERPATH}xlsxzipwriter_p.h \
-$${QXLSX_HEADERPATH}xlsxcelllocation.h \
-$${QXLSX_HEADERPATH}xlsxdatetype.h
+HEADERS += $$files($${QXLSX_HEADERPATH}*.h)
+SOURCES += $$files($${QXLSX_SOURCEPATH}*.cpp)
 
-SOURCES += \
-$${QXLSX_SOURCEPATH}xlsxabstractooxmlfile.cpp \
-$${QXLSX_SOURCEPATH}xlsxabstractsheet.cpp \
-$${QXLSX_SOURCEPATH}xlsxcell.cpp \
-$${QXLSX_SOURCEPATH}xlsxcellformula.cpp \
-$${QXLSX_SOURCEPATH}xlsxcellrange.cpp \
-$${QXLSX_SOURCEPATH}xlsxcellreference.cpp \
-$${QXLSX_SOURCEPATH}xlsxchart.cpp \
-$${QXLSX_SOURCEPATH}xlsxchartsheet.cpp \
-$${QXLSX_SOURCEPATH}xlsxcolor.cpp \
-$${QXLSX_SOURCEPATH}xlsxconditionalformatting.cpp \
-$${QXLSX_SOURCEPATH}xlsxcontenttypes.cpp \
-$${QXLSX_SOURCEPATH}xlsxdatavalidation.cpp \
-$${QXLSX_SOURCEPATH}xlsxdocpropsapp.cpp \
-$${QXLSX_SOURCEPATH}xlsxdocpropscore.cpp \
-$${QXLSX_SOURCEPATH}xlsxdocument.cpp \
-$${QXLSX_SOURCEPATH}xlsxdrawing.cpp \
-$${QXLSX_SOURCEPATH}xlsxdrawinganchor.cpp \
-$${QXLSX_SOURCEPATH}xlsxformat.cpp \
-$${QXLSX_SOURCEPATH}xlsxmediafile.cpp \
-$${QXLSX_SOURCEPATH}xlsxnumformatparser.cpp \
-$${QXLSX_SOURCEPATH}xlsxrelationships.cpp \
-$${QXLSX_SOURCEPATH}xlsxrichstring.cpp \
-$${QXLSX_SOURCEPATH}xlsxsharedstrings.cpp \
-$${QXLSX_SOURCEPATH}xlsxsimpleooxmlfile.cpp \
-$${QXLSX_SOURCEPATH}xlsxstyles.cpp \
-$${QXLSX_SOURCEPATH}xlsxtheme.cpp \
-$${QXLSX_SOURCEPATH}xlsxutility.cpp \
-$${QXLSX_SOURCEPATH}xlsxworkbook.cpp \
-$${QXLSX_SOURCEPATH}xlsxworksheet.cpp \
-$${QXLSX_SOURCEPATH}xlsxzipreader.cpp \
-$${QXLSX_SOURCEPATH}xlsxzipwriter.cpp \
-$${QXLSX_SOURCEPATH}xlsxcelllocation.cpp \
-$${QXLSX_SOURCEPATH}xlsxdatetype.cpp
-
-
-######################################################################
+########################################
 # custom setting for compiler & system
 
 win32-g++ {