From 280b90dd0e575a58dd21f96c025e47fb6ebc3803 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Fri, 8 Sep 2017 06:30:38 +0300
Subject: [PATCH] QZint has been fixed

---
 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro |  2 --
 3rdparty/zint-2.6.1/backend_qt/qzint.h        |  9 ++---
 3rdparty/zint-2.6.1/backend_qt/qzint_global.h | 12 +++++++
 common.pri                                    |  1 +
 limereport/items/lrbarcodeitem.h              | 36 +++++++++++++------
 5 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 3rdparty/zint-2.6.1/backend_qt/qzint_global.h

diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
index e0032e9..9bea19e 100644
--- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
+++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
@@ -22,8 +22,6 @@ unix{
     CONFIG += plugin
 }
 
-#VERSION = 2.4.4
-
 INCLUDEPATH += $$PWD/../backend
 DEFINES +=  _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
 contains(CONFIG,release) {
diff --git a/3rdparty/zint-2.6.1/backend_qt/qzint.h b/3rdparty/zint-2.6.1/backend_qt/qzint.h
index c319225..5c1f9e1 100644
--- a/3rdparty/zint-2.6.1/backend_qt/qzint.h
+++ b/3rdparty/zint-2.6.1/backend_qt/qzint.h
@@ -19,12 +19,13 @@
 #include <QColor>
 #include <QPainter>
 
+#include "qzint_global.h"
 #include "zint.h"
 
 namespace Zint
 {
 
-class QZint
+class QZINTSHARED_EXPORT QZint
 {
 private:
 
@@ -120,9 +121,9 @@ private:
 	float m_scale;
 	int m_option_3;
 	bool m_hidetext;
-        float m_dot_size;
-        int target_size_horiz;
-        int target_size_vert;
+    float m_dot_size;
+    int target_size_horiz;
+    int target_size_vert;
 };
 }
 #endif
diff --git a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h
new file mode 100644
index 0000000..025b16e
--- /dev/null
+++ b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h
@@ -0,0 +1,12 @@
+#ifndef QZINT_GLOBAL_H
+#define QZINT_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(QZINT_LIBRARY)
+#  define QZINTSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define QZINTSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // QZINT_GLOBAL_H
diff --git a/common.pri b/common.pri
index 7ac3243..d9d35bd 100644
--- a/common.pri
+++ b/common.pri
@@ -7,6 +7,7 @@ CONFIG += build_translations
 !contains(CONFIG, qtscriptengine){
     CONFIG += qjsengine
 }
+
 !contains(CONFIG, no_formdesigner){
     CONFIG += dialogdesigner
 }
diff --git a/limereport/items/lrbarcodeitem.h b/limereport/items/lrbarcodeitem.h
index 3f56c59..6b6f98f 100644
--- a/limereport/items/lrbarcodeitem.h
+++ b/limereport/items/lrbarcodeitem.h
@@ -55,6 +55,7 @@ public:
 //    enum BarcodeType {CODE_11=1,C25MATRIX=2,QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84,
 //                      EAN=13,PDF417=55, TELEPEN_NUM=87,ITF14=89, KIX=90, MICROQR=97,
 //                      EAN14=72,CHANNEL=140,CODEONE=141,GRIDMATRIX=142};
+
     enum BarcodeType {
         CODE11          =1,
         C25MATRIX       =2,
@@ -65,6 +66,7 @@ public:
         CODE39          =8,
         EXCODE39        =9,
         EANX            =13,
+        EANX_CHK        =14,
         EAN128          =16,
         CODABAR         =18,
         CODE128         =20,
@@ -115,18 +117,32 @@ public:
         ITALYPOST       =94,
         DPD             =96,
         MICROQR         =97,
+        HIBC_128        =98,
+        HIBC_39         =99,
+        HIBC_DM         =102,
+        HIBC_QR         =104,
+        HIBC_PDF        =106,
+        HIBC_MICPDF     =108,
+        HIBC_BLOCKF     =110,
+        HIBC_AZTEC      =112,
+        DOTCODE         =115,
+        HANXIN          =116,
         TELEPEN_NUM     =128,
         CODE32          =129,
-        EANX_CC         =130,
-        EAN128_CC       =131,
-        RSS14_CC        =132,
-        RSS_LTD_CC      =133,
-        RSS_EXP_CC      =134,
-        UPCA_CC         =135,
-        UPCE_CC         =136,
-        RSS14STACK_CC   =137,
-        RSS14_OMNI_CC   =138,
-        RSS_EXPSTACK_CC =139
+//        EANX_CC         =130,
+//        EAN128_CC       =131,
+//        RSS14_CC        =132,
+//        RSS_LTD_CC      =133,
+//        RSS_EXP_CC      =134,
+//        UPCA_CC         =135,
+//        UPCE_CC         =136,
+//        RSS14STACK_CC   =137,
+//        RSS14_OMNI_CC   =138,
+//        RSS_EXPSTACK_CC =139,
+        CHANNEL         =140,
+        CODEONE         =141,
+        GRIDMATRIX      =142,
+        UPNQR           =143
 
     };
     enum AngleType{Angle0,Angle90,Angle180,Angle270};