mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2025-03-13 22:03:54 +03:00
Merge branch 'master' into develop
# 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:
commit
bd7bea989e
@ -28,7 +28,7 @@ DEFINES += LIMEREPORT_EXPORTS
|
||||
|
||||
contains(CONFIG, staticlib){
|
||||
DEFINES += HAVE_STATIC_BUILD
|
||||
message(Static Build)
|
||||
message(STATIC_BUILD)
|
||||
DEFINES -= LIMEREPORT_EXPORTS
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user