mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport

Browse Source 
# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts
This commit is contained in:
arne krüger
2018-03-09 19:01:07 +01:00
parent da9099cecb 608ae6cda6
commit 85f4fcf7ae
72 changed files with 9216 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
designer/designer.pro
View File

@@ -23,14 +23,16 @@ unix:{
} else {
LIBS += -llimereport
}
contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}
}
DESTDIR = $$DEST_DIR
linux{
#Link share lib to ../lib rpath
@@ -50,15 +52,17 @@ win32 {
DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc
contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
} else {
LIBS += -lQtZint
}
}
}
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -llimereportd