0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 09:04:39 +03:00

Build without zint has been fixed

This commit is contained in:
Arin Alexander 2017-06-13 13:04:32 +03:00
commit 67b0889c8d
2 changed files with 11 additions and 2 deletions

View File

@ -67,7 +67,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 \
@ -93,6 +92,10 @@ SOURCES += \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.cpp \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.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
} }
@ -194,6 +197,10 @@ HEADERS += \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.h \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.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
} }

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"