Skip to content

Commit b1b374a

Browse files
j2dollj2doll
authored
Merge pull request #145 from QtExcel/qt6beta
Qt6beta
2 parents fb3c2cf + d341197 commit b1b374a

File tree

4 files changed

+55
-90
lines changed

4 files changed

+55
-90
lines changed

‎.github/workflows/ubuntu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
steps:
3838
- name: Install Qt
3939
run : |
40+
sudo apt-get update -y
4041
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
4142
- uses: actions/checkout@v1
4243
with:

‎HowToSetProject-cmake.ko.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
> *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
44
5-
:one: 아래와 같은 명령어들읋 입력하세요.
5+
- 다음과 같은 명령어들을 입력하세요.
66

7-
:two: MingW 사용하기
7+
:one: MingW 사용하기
88

99
- QXlsx 라이브러리
1010

@@ -24,6 +24,28 @@ cmake -G "MinGW Makefiles" ..\HelloWorld\
2424
mingw32-make
2525
```
2626

27+
:two: Visual Studio 사용하기
28+
29+
- QXlsx 라이브러리 (Release Build)
30+
31+
```
32+
mkdir build
33+
cd build
34+
cmake -G "Visual Studio 16 2019" ..\QXlsx\
35+
MSBuild /nologo /t:Build /p:Configuration=Release QXlsx.vcxproj
36+
```
37+
38+
- HelloWorld (Release Build)
39+
40+
```
41+
mkdir build2
42+
cd build2
43+
cmake -G "Visual Studio 16 2019" ..\HelloWorld\
44+
MSBuild /nologo /t:Build /p:Configuration=Release HelloWorld.vcxproj
45+
```
46+
47+
- 또는, *.sln/*.vcxproj 파일들을 Visual Studio IDE에서 열어도 됩니다.
48+
2749
:three: Linux/Mac/Unix 사용하기
2850

2951
- QXlsx 라이브러리

‎HowToSetProject-cmake.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
> *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
44
5-
:one: Enter the command as shown below.
5+
- Enter the command as shown below.
66

7-
:two: Using MingW
7+
:one: Using MingW
88

99
- QXlsx library
1010

@@ -24,6 +24,27 @@ cmake -G "MinGW Makefiles" ..\HelloWorld\
2424
mingw32-make
2525
```
2626

27+
:two: Using Visual Studio
28+
29+
- QXlsx library (Release Build)
30+
31+
```
32+
mkdir build
33+
cd build
34+
cmake -G "Visual Studio 16 2019" ..\QXlsx\
35+
MSBuild /nologo /t:Build /p:Configuration=Release QXlsx.vcxproj
36+
```
37+
38+
- HelloWorld (Release Build)
39+
40+
```
41+
mkdir build2
42+
cd build2
43+
cmake -G "Visual Studio 16 2019" ..\HelloWorld\
44+
MSBuild /nologo /t:Build /p:Configuration=Release HelloWorld.vcxproj
45+
```
46+
47+
- Or, You may open *.sln/*.vcxproj files in Visual Studio IDE.
2748

2849
:three: Using Linux/Mac/Unix
2950

‎QXlsx/QXlsx.pri

Lines changed: 7 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
########################################
12
# QXlsx.pri
3+
########################################
24

35
QT += core
46
QT += gui-private
57

8+
# TODO: Define your C++ version. c++14, c++17, etc.
69
CONFIG += c++11
710

811
# The following define makes your compiler emit warnings if you use
@@ -44,95 +47,13 @@ INCLUDEPATH += $$PWD
4447
INCLUDEPATH += $${QXLSX_PARENTPATH}
4548
INCLUDEPATH += $${QXLSX_HEADERPATH}
4649

47-
######################################################################
50+
########################################
4851
# source code
4952

50-
HEADERS += \
51-
$${QXLSX_HEADERPATH}xlsxabstractooxmlfile.h \
52-
$${QXLSX_HEADERPATH}xlsxabstractooxmlfile_p.h \
53-
$${QXLSX_HEADERPATH}xlsxabstractsheet.h \
54-
$${QXLSX_HEADERPATH}xlsxabstractsheet_p.h \
55-
$${QXLSX_HEADERPATH}xlsxcell.h \
56-
$${QXLSX_HEADERPATH}xlsxcellformula.h \
57-
$${QXLSX_HEADERPATH}xlsxcellformula_p.h \
58-
$${QXLSX_HEADERPATH}xlsxcellrange.h \
59-
$${QXLSX_HEADERPATH}xlsxcellreference.h \
60-
$${QXLSX_HEADERPATH}xlsxcell_p.h \
61-
$${QXLSX_HEADERPATH}xlsxchart.h \
62-
$${QXLSX_HEADERPATH}xlsxchartsheet.h \
63-
$${QXLSX_HEADERPATH}xlsxchartsheet_p.h \
64-
$${QXLSX_HEADERPATH}xlsxchart_p.h \
65-
$${QXLSX_HEADERPATH}xlsxcolor_p.h \
66-
$${QXLSX_HEADERPATH}xlsxconditionalformatting.h \
67-
$${QXLSX_HEADERPATH}xlsxconditionalformatting_p.h \
68-
$${QXLSX_HEADERPATH}xlsxcontenttypes_p.h \
69-
$${QXLSX_HEADERPATH}xlsxdatavalidation.h \
70-
$${QXLSX_HEADERPATH}xlsxdatavalidation_p.h \
71-
$${QXLSX_HEADERPATH}xlsxdocpropsapp_p.h \
72-
$${QXLSX_HEADERPATH}xlsxdocpropscore_p.h \
73-
$${QXLSX_HEADERPATH}xlsxdocument.h \
74-
$${QXLSX_HEADERPATH}xlsxdocument_p.h \
75-
$${QXLSX_HEADERPATH}xlsxdrawinganchor_p.h \
76-
$${QXLSX_HEADERPATH}xlsxdrawing_p.h \
77-
$${QXLSX_HEADERPATH}xlsxformat.h \
78-
$${QXLSX_HEADERPATH}xlsxformat_p.h \
79-
$${QXLSX_HEADERPATH}xlsxglobal.h \
80-
$${QXLSX_HEADERPATH}xlsxmediafile_p.h \
81-
$${QXLSX_HEADERPATH}xlsxnumformatparser_p.h \
82-
$${QXLSX_HEADERPATH}xlsxrelationships_p.h \
83-
$${QXLSX_HEADERPATH}xlsxrichstring.h \
84-
$${QXLSX_HEADERPATH}xlsxrichstring_p.h \
85-
$${QXLSX_HEADERPATH}xlsxsharedstrings_p.h \
86-
$${QXLSX_HEADERPATH}xlsxsimpleooxmlfile_p.h \
87-
$${QXLSX_HEADERPATH}xlsxstyles_p.h \
88-
$${QXLSX_HEADERPATH}xlsxtheme_p.h \
89-
$${QXLSX_HEADERPATH}xlsxutility_p.h \
90-
$${QXLSX_HEADERPATH}xlsxworkbook.h \
91-
$${QXLSX_HEADERPATH}xlsxworkbook_p.h \
92-
$${QXLSX_HEADERPATH}xlsxworksheet.h \
93-
$${QXLSX_HEADERPATH}xlsxworksheet_p.h \
94-
$${QXLSX_HEADERPATH}xlsxzipreader_p.h \
95-
$${QXLSX_HEADERPATH}xlsxzipwriter_p.h \
96-
$${QXLSX_HEADERPATH}xlsxcelllocation.h \
97-
$${QXLSX_HEADERPATH}xlsxdatetype.h
53+
HEADERS += $$files($${QXLSX_HEADERPATH}*.h)
54+
SOURCES += $$files($${QXLSX_SOURCEPATH}*.cpp)
9855

99-
SOURCES += \
100-
$${QXLSX_SOURCEPATH}xlsxabstractooxmlfile.cpp \
101-
$${QXLSX_SOURCEPATH}xlsxabstractsheet.cpp \
102-
$${QXLSX_SOURCEPATH}xlsxcell.cpp \
103-
$${QXLSX_SOURCEPATH}xlsxcellformula.cpp \
104-
$${QXLSX_SOURCEPATH}xlsxcellrange.cpp \
105-
$${QXLSX_SOURCEPATH}xlsxcellreference.cpp \
106-
$${QXLSX_SOURCEPATH}xlsxchart.cpp \
107-
$${QXLSX_SOURCEPATH}xlsxchartsheet.cpp \
108-
$${QXLSX_SOURCEPATH}xlsxcolor.cpp \
109-
$${QXLSX_SOURCEPATH}xlsxconditionalformatting.cpp \
110-
$${QXLSX_SOURCEPATH}xlsxcontenttypes.cpp \
111-
$${QXLSX_SOURCEPATH}xlsxdatavalidation.cpp \
112-
$${QXLSX_SOURCEPATH}xlsxdocpropsapp.cpp \
113-
$${QXLSX_SOURCEPATH}xlsxdocpropscore.cpp \
114-
$${QXLSX_SOURCEPATH}xlsxdocument.cpp \
115-
$${QXLSX_SOURCEPATH}xlsxdrawing.cpp \
116-
$${QXLSX_SOURCEPATH}xlsxdrawinganchor.cpp \
117-
$${QXLSX_SOURCEPATH}xlsxformat.cpp \
118-
$${QXLSX_SOURCEPATH}xlsxmediafile.cpp \
119-
$${QXLSX_SOURCEPATH}xlsxnumformatparser.cpp \
120-
$${QXLSX_SOURCEPATH}xlsxrelationships.cpp \
121-
$${QXLSX_SOURCEPATH}xlsxrichstring.cpp \
122-
$${QXLSX_SOURCEPATH}xlsxsharedstrings.cpp \
123-
$${QXLSX_SOURCEPATH}xlsxsimpleooxmlfile.cpp \
124-
$${QXLSX_SOURCEPATH}xlsxstyles.cpp \
125-
$${QXLSX_SOURCEPATH}xlsxtheme.cpp \
126-
$${QXLSX_SOURCEPATH}xlsxutility.cpp \
127-
$${QXLSX_SOURCEPATH}xlsxworkbook.cpp \
128-
$${QXLSX_SOURCEPATH}xlsxworksheet.cpp \
129-
$${QXLSX_SOURCEPATH}xlsxzipreader.cpp \
130-
$${QXLSX_SOURCEPATH}xlsxzipwriter.cpp \
131-
$${QXLSX_SOURCEPATH}xlsxcelllocation.cpp \
132-
$${QXLSX_SOURCEPATH}xlsxdatetype.cpp
133-
134-
135-
######################################################################
56+
########################################
13657
# custom setting for compiler & system
13758

13859
win32-g++ {

0 commit comments

Comments
 (0)