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.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

47
limereport/limereport.pro
View File

@@ -1,4 +1,4 @@
CONFIG(debug, debug|release){
CONFIG(debug, debug|release) {
TARGET = limereportd
} else {
TARGET = limereport
@@ -6,11 +6,11 @@ CONFIG(debug, debug|release){
TEMPLATE = lib
contains(CONFIG, static_build){
CONFIG(static_build) {
CONFIG += staticlib
}
!contains(CONFIG, staticlib){
!CONFIG(staticlib) {
CONFIG += lib
CONFIG += dll
}
@@ -19,14 +19,14 @@ CONFIG += create_prl
CONFIG += link_prl
macx{
CONFIG -= dll
CONFIG += lib_bundle
CONFIG += plugin
CONFIG -= dll
CONFIG += lib_bundle
CONFIG += plugin
}
DEFINES += LIMEREPORT_EXPORTS
contains(CONFIG, staticlib){
CONFIG(staticlib) {
DEFINES += HAVE_STATIC_BUILD
DEFINES += QZINT_STATIC_BUILD
message(STATIC_BUILD)
@@ -42,19 +42,20 @@ EXTRA_FILES += \
$$PWD/lrcallbackdatasourceintf.h \
$$PWD/lrpreviewreportwidget.h \
$$PWD/lrreportdesignwindowintrerface.h
$$PWD/lrpreparedpagesintf.h
include(limereport.pri)
unix:{
DESTDIR = $${DEST_LIBS}
DESTDIR = $${DEST_LIBS}
linux{
QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){
for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
}
}
macx{
for(FILE,EXTRA_FILES){
for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
}
QMAKE_POST_LINK += mkdir -p \"$${DESTDIR}/include\" $$escape_expand(\\n\\t)
@@ -64,9 +65,9 @@ unix:{
win32 {
DESTDIR = $${DEST_LIBS}
contains(QMAKE_HOST.os, Linux){
contains(QMAKE_HOST.os, Linux) {
QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){
for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
}
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
@@ -77,23 +78,23 @@ win32 {
DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g
for(FILE,EXTRA_FILES){
for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
}
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
}
}
contains(CONFIG,zint){
CONFIG(zint) {
message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
LIBS += -L$${DEST_LIBS}
CONFIG(release, debug|release){
LIBS += -lQtZint
} else {
LIBS += -lQtZintd
}
LIBS += -L$${DEST_LIBS}
CONFIG(release, debug|release) {
LIBS += -lQtZint
} else {
LIBS += -lQtZintd
}
}
#### Install mkspecs, headers and libs to QT_INSTALL_DIR
@@ -111,8 +112,8 @@ INSTALLS += target
####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){
LANGUAGES = ru es_ES ar fr zh
CONFIG(build_translations) {
LANGUAGES = ru es ar fr zh pl
defineReplace(prependAll) {
for(a,$$1):result += $$2$${a}$$3
@@ -138,5 +139,3 @@ contains(CONFIG,build_translations){
}
#### EN AUTOMATIC TRANSLATIONS