mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00
Code Activity

Merge tag '1.5.42' into develop

Browse Source 
Finish 1.5.42

# Conflicts:
#	limereport/limereport.pri
This commit is contained in:
Arin Alexander
2020-03-18 13:43:50 +03:00
parent 0c7878bab5 bd905f8daa
commit 4bada7b289
15 changed files with 428 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
limereport/limereport.pri
View File

@@ -91,6 +91,11 @@ contains(CONFIG, zint){
SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
}
contains(CONFIG, svg){
SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \
}
greaterThan(QT_MAJOR_VERSION, 4) {
SOURCES += $$REPORT_PATH/exporters/lrhtmlexporter.cpp
contains(CONFIG, qtxlsx){
@@ -188,6 +193,10 @@ contains(CONFIG,zint){
HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
}
contains(CONFIG, svg){
HEADERS += $$REPORT_PATH/items/lrsvgitem.h
}
greaterThan(QT_MAJOR_VERSION, 4) {
HEADERS += $$REPORT_PATH/exporters/lrhtmlexporter.h
contains(CONFIG, qtxlsx){