mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Build without zint has been fixed

Browse Source 
# Conflicts:
#	limereport/limereport.pri
This commit is contained in:
Arin Alexander 2017-06-13 13:05:36 +03:00
commit bd67cf8f12
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/limereport.pri
View File

@ -72,7 +72,6 @@ SOURCES += \
$$REPORT_PATH/items/lrtextitemeditor.cpp \ $$REPORT_PATH/items/lrtextitemeditor.cpp \
$$REPORT_PATH/items/lrshapeitem.cpp \ $$REPORT_PATH/items/lrshapeitem.cpp \
$$REPORT_PATH/items/lrtextitem.cpp \ $$REPORT_PATH/items/lrtextitem.cpp \
$$REPORT_PATH/lrfactoryinitializer.cpp \
$$REPORT_PATH/lrbanddesignintf.cpp \ $$REPORT_PATH/lrbanddesignintf.cpp \
$$REPORT_PATH/lrpageitemdesignintf.cpp \ $$REPORT_PATH/lrpageitemdesignintf.cpp \
$$REPORT_PATH/lrpagedesignintf.cpp \ $$REPORT_PATH/lrpagedesignintf.cpp \
@ -97,6 +96,9 @@ SOURCES += \
$$REPORT_PATH/lrsettingdialog.cpp \ $$REPORT_PATH/lrsettingdialog.cpp \
$$REPORT_PATH/lritemscontainerdesignitf.cpp $$REPORT_PATH/lritemscontainerdesignitf.cpp
contains(CONFIG, staticbuild){
SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
}
contains(CONFIG, zint){ contains(CONFIG, zint){
SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
@ -199,6 +201,10 @@ HEADERS += \
$$REPORT_PATH/lrpreviewreportwidget_p.h \ $$REPORT_PATH/lrpreviewreportwidget_p.h \
$$REPORT_PATH/lritemscontainerdesignitf.h $$REPORT_PATH/lritemscontainerdesignitf.h
contains(CONFIG, staticbuild){
HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
}
contains(CONFIG,zint){ contains(CONFIG,zint){
HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
} }

2
limereport/lrfactoryinitializer.cpp
View File

@ -9,7 +9,9 @@
#include "items/lrtextitem.h" #include "items/lrtextitem.h"
#ifdef HAVE_ZINT
#include "items/lrbarcodeitem.h" #include "items/lrbarcodeitem.h"
#endif
#include "items/lrhorizontallayout.h" #include "items/lrhorizontallayout.h"
#include "items/lrimageitem.h" #include "items/lrimageitem.h"
#include "items/lrshapeitem.h" #include "items/lrshapeitem.h"