python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-03-28 21:23:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

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
#	limereport/limereport.pro
#	translations/limereport_ar.ts
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_fr.ts
#	translations/limereport_ru.qm
This commit is contained in:
Arin Alex 2018-03-13 15:23:47 +03:00
commit bd7bea989e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/limereport.pro
View File

@ -28,7 +28,7 @@ DEFINES += LIMEREPORT_EXPORTS
contains(CONFIG, staticlib){
DEFINES += HAVE_STATIC_BUILD
message(Static Build)
message(STATIC_BUILD)
DEFINES -= LIMEREPORT_EXPORTS
}