mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-02 19:56:58 +03:00
Code Activity

Merge tag '1.5.88' into develop

Browse Source 
Finish 1.5.88

# Conflicts:
#	limereport/limereport.pri
#	limereport/limereport.pro
This commit is contained in:
fralx
2021-09-11 19:29:52 +03:00
parent 19e0f2cc30 9cae735488
commit 296fc475fd
239 changed files with 2492 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/3rdparty.pro vendored
View File

@@ -1,5 +1,8 @@
ZINT_PATH = $$PWD/zint-2.6.1/
ZINT_PATH = $$PWD/zint-2.6.1
ZINT_VERSION = 2.6.1
INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt
DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt
include($${ZINT_PATH}/backend_qt/backend_qt.pro)
CONFIG -= warn_on
CONFIG += warn_off

66
3rdparty/zint-2.6.1/backend_qt/backend_qt.pro vendored
View File

@@ -1,13 +1,13 @@
DEFINES += NO_PNG
TEMPLATE = lib
contains(CONFIG, static_build){
CONFIG(static_build) {
message(Static Build)
CONFIG += staticlib
DEFINES += QZINT_STATIC_BUILD
}
!contains(CONFIG, staticlib){
!CONFIG(staticlib) {
CONFIG += dll
DEFINES += QZINT_LIBRARY
}
@@ -24,11 +24,13 @@ unix{
}
INCLUDEPATH += $$PWD/../backend
DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
CONFIG(release, debug|release){
TARGET = QtZint
DEFINES += ZINT_VERSION=\\\"$$ZINT_VERSION\\\"
CONFIG(release, debug|release) {
TARGET = QtZint
} else {
TARGET = QtZintd
TARGET = QtZintd
}
!contains(DEFINES, NO_PNG) {
@@ -36,38 +38,30 @@ CONFIG(release, debug|release){
LIBS += -lpng
}
win32-msvc* {
DEFINES += _CRT_SECURE_NO_WARNINGS
#QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
#QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305
}
INCLUDEPATH += zint zint/backend zint/backend_qt
HEADERS += $$PWD/../backend/aztec.h \
$$PWD/../backend/bmp.h \
$$PWD/../backend/code49.h \
$$PWD/../backend/common.h \
$$PWD/../backend/composite.h \
$$PWD/../backend/dmatrix.h \
$$PWD/../backend/eci.h \
$$PWD/../backend/font.h \
$$PWD/../backend/gridmtx.h \
$$PWD/../backend/gs1.h \
$$PWD/../backend/hanxin.h \
$$PWD/../backend/large.h \
$$PWD/../backend/maxicode.h \
$$PWD/../backend/pcx.h \
$$PWD/../backend/pdf417.h \
$$PWD/../backend/reedsol.h \
$$PWD/../backend/rss.h \
$$PWD/../backend/sjis.h \
$$PWD/../backend/stdint_msvc.h \
$$PWD/../backend/zint.h \
$$PWD/qzint.h \
$$PWD/qzint_global.h
HEADERS += $$PWD/../backend/aztec.h \
$$PWD/../backend/bmp.h \
$$PWD/../backend/code49.h \
$$PWD/../backend/common.h \
$$PWD/../backend/composite.h \
$$PWD/../backend/dmatrix.h \
$$PWD/../backend/eci.h \
$$PWD/../backend/font.h \
$$PWD/../backend/gridmtx.h \
$$PWD/../backend/gs1.h \
$$PWD/../backend/hanxin.h \
$$PWD/../backend/large.h \
$$PWD/../backend/maxicode.h \
$$PWD/../backend/pcx.h \
$$PWD/../backend/pdf417.h \
$$PWD/../backend/reedsol.h \
$$PWD/../backend/rss.h \
$$PWD/../backend/sjis.h \
$$PWD/../backend/stdint_msvc.h \
$$PWD/../backend/zint.h \
$$PWD/qzint.h \
$$PWD/qzint_global.h
SOURCES += $$PWD/../backend/2of5.c \
$$PWD/../backend/auspost.c \