Skip to content

Commit d90f6bf

Browse files
committed
Update zint qml integration
1 parent c047266 commit d90f6bf

7 files changed

Lines changed: 32 additions & 8 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
set(SOURCES
3+
ZintQml.cpp ZintQml.h
4+
ZintImageProvider.cpp ZintImageProvider.h
5+
)
6+
7+
add_library (ZintQml ${SOURCES})
8+
9+
#target_link_libraries (ZintQml PRIVATE zint-package::zint)
10+
#target_include_directories (ZintQml PRIVATE zint-package::zint)
11+
12+
find_package (Qt6 REQUIRED COMPONENTS Core Quick)
13+
target_link_libraries (ZintQml PRIVATE Qt6::Core Qt6::Quick)
14+
15+
target_include_directories (ZintQml PUBLIC ${CMAKE_CURRENT_LIST_DIR})

thirdparty/zint-qml/ZintImageProvider.cpp renamed to thirdparty/zint-qml/wrappers/qml/ZintImageProvider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "ZintImageProvider.h"
66
#include "ZintQml.h"
77

8-
#include "backend/zint.h" // Use the embedded zint copy
8+
#include "../../backend/zint.h" // Use the embedded zint copy
99
//#include <zint.h> // Use the system zint copy
1010

1111
#include <QDebug>
File renamed without changes.

thirdparty/zint-qml/ZintQml.cpp renamed to thirdparty/zint-qml/wrappers/qml/ZintQml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "ZintQml.h"
66
#include "ZintImageProvider.h"
77

8-
#include "backend/zint.h" // Use the embedded zint copy
8+
#include "../../backend/zint.h" // Use the embedded zint copy
99
//#include <zint.h> // Use the system zint copy
1010

1111
#include <QUrl>
File renamed without changes.

thirdparty/zint-qml/zint-qml.pri

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# qmake project file for zint-qml
3-
# version 2.13
2+
# qmake project file for zint and ZintQml
3+
# version 2.15
44
#
55

66
CONFIG += c++17
@@ -12,33 +12,41 @@ INCLUDEPATH += $${PWD}
1212

1313
################# WRAPPER
1414

15-
SOURCES += $${PWD}/ZintQml.cpp \
16-
$${PWD}/ZintImageProvider.cpp
15+
SOURCES += $${PWD}/wrappers/qml/ZintQml.cpp \
16+
$${PWD}/wrappers/qml/ZintImageProvider.cpp
1717

18-
HEADERS += $${PWD}/ZintQml.h \
19-
$${PWD}/ZintImageProvider.h
18+
HEADERS += $${PWD}/wrappers/qml/ZintQml.h \
19+
$${PWD}/wrappers/qml/ZintImageProvider.h
2020

2121
################# COMMON_FILES
2222

2323
DEFINES += ZINT_NO_PNG
2424

2525
SOURCES += $${PWD}/backend/2of5.c \
26+
$${PWD}/backend/2of5inter.c \
27+
$${PWD}/backend/2of5inter_based.c \
2628
$${PWD}/backend/auspost.c \
2729
$${PWD}/backend/aztec.c \
2830
$${PWD}/backend/bc412.c \
2931
$${PWD}/backend/bmp.c \
32+
$${PWD}/backend/channel.c \
33+
$${PWD}/backend/codabar.c \
3034
$${PWD}/backend/codablock.c \
3135
$${PWD}/backend/code.c \
3236
$${PWD}/backend/code1.c \
37+
$${PWD}/backend/code11.c \
3338
$${PWD}/backend/code128.c \
39+
$${PWD}/backend/code128_based.c \
3440
$${PWD}/backend/code16k.c \
3541
$${PWD}/backend/code49.c \
3642
$${PWD}/backend/common.c \
3743
$${PWD}/backend/composite.c \
3844
$${PWD}/backend/dmatrix.c \
3945
$${PWD}/backend/dotcode.c \
46+
$${PWD}/backend/dxfilmedge.c \
4047
$${PWD}/backend/eci.c \
4148
$${PWD}/backend/emf.c \
49+
$${PWD}/backend/filemem.c \
4250
$${PWD}/backend/general_field.c \
4351
$${PWD}/backend/gif.c \
4452
$${PWD}/backend/gridmtx.c \
@@ -83,6 +91,7 @@ HEADERS += $${PWD}/backend/aztec.h \
8391
$${PWD}/backend/eci.h \
8492
$${PWD}/backend/eci_sb.h \
8593
$${PWD}/backend/emf.h \
94+
$${PWD}/backend/filemem.h \
8695
$${PWD}/backend/raster_font.h \
8796
$${PWD}/backend/gb18030.h \
8897
$${PWD}/backend/gb2312.h \

0 commit comments

Comments
 (0)