From 6ed6beb39528885ce3f2ba44f97752385bd49fc8 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 13 Jun 2017 13:03:38 +0300 Subject: [PATCH] build without zint has been fixed --- limereport/limereport.pri | 11 +++++++++-- limereport/lrfactoryinitializer.cpp | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/limereport/limereport.pri b/limereport/limereport.pri index 4e714cf..25568a7 100644 --- a/limereport/limereport.pri +++ b/limereport/limereport.pri @@ -67,7 +67,6 @@ SOURCES += \ $$REPORT_PATH/items/lrtextitemeditor.cpp \ $$REPORT_PATH/items/lrshapeitem.cpp \ $$REPORT_PATH/items/lrtextitem.cpp \ - $$REPORT_PATH/lrfactoryinitializer.cpp \ $$REPORT_PATH/lrbanddesignintf.cpp \ $$REPORT_PATH/lrpageitemdesignintf.cpp \ $$REPORT_PATH/lrpagedesignintf.cpp \ @@ -92,6 +91,10 @@ SOURCES += \ $$REPORT_PATH/lrsettingdialog.cpp \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.cpp \ $$REPORT_PATH/lritemscontainerdesignitf.cpp + +contains(CONFIG, staticbuild){ + SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp +} contains(CONFIG, zint){ SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp @@ -193,7 +196,11 @@ HEADERS += \ $$REPORT_PATH/lrpreviewreportwidget_p.h \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.h \ $$REPORT_PATH/lritemscontainerdesignitf.h - + +contains(CONFIG, staticbuild){ + HEADERS += $$REPORT_PATH/lrfactoryinitializer.h +} + contains(CONFIG,zint){ HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h } diff --git a/limereport/lrfactoryinitializer.cpp b/limereport/lrfactoryinitializer.cpp index d607be5..cf83c8c 100644 --- a/limereport/lrfactoryinitializer.cpp +++ b/limereport/lrfactoryinitializer.cpp @@ -9,7 +9,9 @@ #include "items/lrtextitem.h" +#ifdef HAVE_ZINT #include "items/lrbarcodeitem.h" +#endif #include "items/lrhorizontallayout.h" #include "items/lrimageitem.h" #include "items/lrshapeitem.h"