mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-03 20:04:43 +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

15
console/console.pro
View File

@@ -23,13 +23,12 @@ CONFIG(debug, debug|release) {
} else {
LIBS += -llimereport
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
!CONFIG(static_build) : CONFIG(zint) {
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}

2
console/main.cpp
View File

@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
QApplication::setApplicationVersion(LIMEREPORT_VERSION_STR);
QStringList vars;
#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
#if QT_VERSION > 0x050200
QCommandLineParser parser;
parser.addHelpOption();
parser.addVersionOption();