mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

QZint has been fixed

Browse Source
This commit is contained in:
Arin Alex 2017-09-08 06:30:38 +03:00
parent b6d03ab71c
commit 280b90dd0e
5 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/zint-2.6.1/backend_qt/backend_qt.pro vendored
View File

@ -22,8 +22,6 @@ unix{
CONFIG += plugin CONFIG += plugin
} }
#VERSION = 2.4.4
INCLUDEPATH += $$PWD/../backend INCLUDEPATH += $$PWD/../backend
DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
contains(CONFIG,release) { contains(CONFIG,release) {

3
3rdparty/zint-2.6.1/backend_qt/qzint.h vendored
View File

@ -19,12 +19,13 @@
#include <QColor> #include <QColor>
#include <QPainter> #include <QPainter>
#include "qzint_global.h"
#include "zint.h" #include "zint.h"
namespace Zint namespace Zint
{ {
class QZint class QZINTSHARED_EXPORT QZint
{ {
private: private:

12
3rdparty/zint-2.6.1/backend_qt/qzint_global.h vendored Normal file
View File

@ -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

1
common.pri
View File

@ -7,6 +7,7 @@ CONFIG += build_translations
!contains(CONFIG, qtscriptengine){ !contains(CONFIG, qtscriptengine){
CONFIG += qjsengine CONFIG += qjsengine
} }
!contains(CONFIG, no_formdesigner){ !contains(CONFIG, no_formdesigner){
CONFIG += dialogdesigner CONFIG += dialogdesigner
} }

36
limereport/items/lrbarcodeitem.h
View File

@ -55,6 +55,7 @@ public:
// enum BarcodeType {CODE_11=1,C25MATRIX=2,QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84, // 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, // EAN=13,PDF417=55, TELEPEN_NUM=87,ITF14=89, KIX=90, MICROQR=97,
// EAN14=72,CHANNEL=140,CODEONE=141,GRIDMATRIX=142}; // EAN14=72,CHANNEL=140,CODEONE=141,GRIDMATRIX=142};
enum BarcodeType { enum BarcodeType {
CODE11 =1, CODE11 =1,
C25MATRIX =2, C25MATRIX =2,
@ -65,6 +66,7 @@ public:
CODE39 =8, CODE39 =8,
EXCODE39 =9, EXCODE39 =9,
EANX =13, EANX =13,
EANX_CHK =14,
EAN128 =16, EAN128 =16,
CODABAR =18, CODABAR =18,
CODE128 =20, CODE128 =20,
@ -115,18 +117,32 @@ public:
ITALYPOST =94, ITALYPOST =94,
DPD =96, DPD =96,
MICROQR =97, 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, TELEPEN_NUM =128,
CODE32 =129, CODE32 =129,
EANX_CC =130, // EANX_CC =130,
EAN128_CC =131, // EAN128_CC =131,
RSS14_CC =132, // RSS14_CC =132,
RSS_LTD_CC =133, // RSS_LTD_CC =133,
RSS_EXP_CC =134, // RSS_EXP_CC =134,
UPCA_CC =135, // UPCA_CC =135,
UPCE_CC =136, // UPCE_CC =136,
RSS14STACK_CC =137, // RSS14STACK_CC =137,
RSS14_OMNI_CC =138, // RSS14_OMNI_CC =138,
RSS_EXPSTACK_CC =139 // RSS_EXPSTACK_CC =139,
CHANNEL =140,
CODEONE =141,
GRIDMATRIX =142,
UPNQR =143
}; };
enum AngleType{Angle0,Angle90,Angle180,Angle270}; enum AngleType{Angle0,Angle90,Angle180,Angle270};