mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move QZint class into frontend binary

Browse Source
This commit is contained in:
Robin Stuart 2020-11-22 20:17:46 +00:00
parent 3eb31fe3f8
commit f9b639ed9c
13 changed files with 77 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -120,7 +120,6 @@ if($ENV{CMAKE_PREFIX_PATH} MATCHES "6[.][0-9][.][0-9]")
${Qt6UiTools_INCLUDES} ${Qt6UiTools_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
add_subdirectory(backend_qt)
add_subdirectory(frontend_qt) add_subdirectory(frontend_qt)
else() else()
message(STATUS "Could NOT find Qt6") message(STATUS "Could NOT find Qt6")
@ -142,7 +141,6 @@ else()
${Qt5UiTools_INCLUDES} ${Qt5UiTools_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
add_subdirectory(backend_qt)
add_subdirectory(frontend_qt) add_subdirectory(frontend_qt)
else() else()
message(STATUS "Could NOT find Qt5") message(STATUS "Could NOT find Qt5")

32
backend_qt/CMakeLists.txt
View File

@ -1,32 +0,0 @@
# (c) 2008 by BogDan Vatra < bogdan@licentia.eu >
# vim: set ts=4 sw=4 et :
project(QZint)
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend" )
set(QZint_SRCS qzint.cpp)
if(USE_QT6)
qt6_wrap_cpp(QZint_SRCS qzint.h)
else()
qt5_wrap_cpp(QZint_SRCS qzint.h)
endif()
add_library(QZint SHARED ${QZint_SRCS})
set_target_properties(QZint PROPERTIES SOVERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}"
VERSION ${ZINT_VERSION})
add_dependencies(QZint zint)
link_directories( "${CMAKE_BINARY_DIR}/backend" )
if(USE_QT6)
target_link_libraries(QZint zint Qt6::Widgets Qt6::Gui)
else()
target_link_libraries(QZint zint Qt5::Widgets Qt5::Gui)
endif()
install(TARGETS QZint ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES qzint.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

144
backend_qt/backend_qt.pro
View File

@ -1,144 +0,0 @@
TEMPLATE = lib
# My qt is configured for static build:
# http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
CONFIG += staticlib
# for dynamic build enable this:
#CONFIG += dll
macx{
CONFIG -= dll
CONFIG += lib_bundle
}
TARGET = QtZint
INCLUDEPATH += ../backend
#EDIT THIS !!!!
DEFINES += ZINT_VERSION="\\\"2.9.1.9\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng
INCLUDEPATH += ../../zlib
}
contains(DEFINES, QR_SYSTEM){
LIBS += -lqrencode
}
contains(DEFINES, QR){
INCLUDEPATH += qrencode
HEADERS += qrencode/bitstream.h \
qrencode/mask.h \
qrencode/qrencode.h \
qrencode/qrencode_inner.h \
qrencode/qrinput.h \
qrencode/qrspec.h \
qrencode/rscode.h \
qrencode/split.h
SOURCES += qrencode/bitstream.c \
qrencode/mask.c \
qrencode/qrencode.c \
qrencode/qrinput.c \
qrencode/qrspec.c \
qrencode/rscode.c \
qrencode/split.c
}
HEADERS += ../backend/aztec.h \
../backend/bmp.h \
../backend/channel_precalcs.h \
../backend/code128.h \
../backend/code49.h \
../backend/common.h \
../backend/composite.h \
../backend/dmatrix.h \
../backend/eci.h \
../backend/font.h \
../backend/gb18030.h \
../backend/gb2312.h \
../backend/gridmtx.h \
../backend/gs1.h \
../backend/hanxin.h \
../backend/large.h \
../backend/maxicode.h \
../backend/output.h \
../backend/pcx.h \
../backend/pdf417.h \
../backend/reedsol.h \
../backend/rss.h \
../backend/sjis.h \
../backend/stdint_msvc.h \
../backend/zint.h \
qzint.h
SOURCES += ../backend/2of5.c \
../backend/auspost.c \
../backend/aztec.c \
../backend/bmp.c \
../backend/codablock.c \
../backend/code.c \
../backend/code128.c \
../backend/code16k.c \
../backend/code49.c \
../backend/common.c \
../backend/composite.c \
../backend/dmatrix.c \
../backend/dotcode.c \
../backend/eci.c \
../backend/emf.c \
../backend/gb18030.c \
../backend/gb2312.c \
../backend/general_field.c \
../backend/gif.c \
../backend/gridmtx.c \
../backend/gs1.c \
../backend/hanxin.c \
../backend/imail.c \
../backend/large.c \
../backend/library.c \
../backend/mailmark.c \
../backend/maxicode.c \
../backend/medical.c \
../backend/output.c \
../backend/pcx.c \
../backend/pdf417.c \
../backend/plessey.c \
../backend/postal.c \
../backend/ps.c \
../backend/raster.c \
../backend/reedsol.c \
../backend/rss.c \
../backend/sjis.c \
../backend/svg.c \
../backend/telepen.c \
../backend/tif.c \
../backend/ultra.c \
../backend/upcean.c \
../backend/vector.c \
../backend/qr.c \
../backend/dllversion.c \
../backend/code1.c \
../backend/png.c \
qzint.cpp
VERSION = 2.9.1.9
#DESTDIR = .
#include.path = $$[ZINT_INSTALL_HEADERS]
include.path = inst/include
include.files = ../backend/zint.h qzint.h
#target.path = $$[ZINT_INSTALL_LIBS]
target.path = inst/lib
INSTALLS += target include

13
backend_qt/backend_qt_zintdll.pro
View File

@ -1,13 +0,0 @@
TEMPLATE = lib
CONFIG += staticlib
TARGET = QtZintDLL
INCLUDEPATH += ../backend
LIBS += -L"../win32/Release" -lzint
HEADERS += qzint.h
SOURCES += qzint.cpp

97
backend_qt/backend_vc8.pro
View File

@ -1,97 +0,0 @@
win32 {
TEMPLATE = vclib
CONFIG += staticlib debug-and-release
}
TARGET = QtZint2
VERSION = 2.9.1.9
QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305
INCLUDEPATH += ../backend d:\\opt\\include
DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" include=""
!contains(DEFINES, NO_PNG) {
SOURCES += ../backend/png.c
}
HEADERS += ../backend/aztec.h \
../backend/bmp.h \
../backend/channel_precalcs.h \
../backend/code1.h \
../backend/code128.h \
../backend/code49.h \
../backend/common.h \
../backend/composite.h \
../backend/dmatrix.h \
../backend/eci.h \
../backend/emf.h \
../backend/font.h \
../backend/gb18030.h \
../backend/gb2312.h \
../backend/general_field.h \
../backend/gridmtx.h \
../backend/gs1.h \
../backend/hanxin.h \
../backend/large.h \
../backend/maxicode.h \
../backend/ms_stdint.h \
../backend/output.h \
../backend/pcx.h \
../backend/pdf417.h \
../backend/qr.h \
../backend/reedsol.h \
../backend/rss.h \
../backend/sjis.h \
../backend/tif.h \
../backend/zint.h \
qzint.h
SOURCES += ../backend/2of5.c \
../backend/auspost.c \
../backend/aztec.c \
../backend/bmp.c \
../backend/codablock.c \
../backend/code.c \
../backend/code1.c \
../backend/code128.c \
../backend/code16k.c \
../backend/code49.c \
../backend/common.c \
../backend/composite.c \
../backend/dmatrix.c \
../backend/dotcode.c \
../backend/eci.c \
../backend/emf.c \
../backend/gb18030.c \
../backend/gb2312.c \
../backend/gridmtx.c \
../backend/general_field.c \
../backend/gif.c \
../backend/gs1.c \
../backend/hanxin.c \
../backend/imail.c \
../backend/large.c \
../backend/library.c \
../backend/mailmark.c \
../backend/maxicode.c \
../backend/medical.c \
../backend/output.c \
../backend/pcx.c \
../backend/pdf417.c \
../backend/plessey.c \
../backend/postal.c \
../backend/ps.c \
../backend/qr.c \
../backend/raster.c \
../backend/reedsol.c \
../backend/rss.c \
../backend/svg.c \
../backend/telepen.c \
../backend/tif.c \
../backend/ultra.c \
../backend/upcean.c \
../backend/vector.c \
qzint.cpp

9
backend_qt/readme
View File

@ -1,9 +0,0 @@
Edit zint-1.6.pro and edit the 'DEFINES' section
NO_PNG -> compile zint without png support
NO_QR -> compile zint without QR support
QR_SYSTEM -> if you have QT installed in your system, zint will be compiled with QT support
QR -> compile zint with QR support static (you must have qrencode in the current folder)
Edit compile_n_config and set the paths.
Exec compile_n_config

12
frontend_qt/CMakeLists.txt
View File

@ -3,16 +3,16 @@
project(zint-qt) project(zint-qt)
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend" "${CMAKE_SOURCE_DIR}/backend_qt") include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend")
set(zint-qt_SRCS barcodeitem.cpp main.cpp mainwindow.cpp datawindow.cpp sequencewindow.cpp exportwindow.cpp) set(zint-qt_SRCS barcodeitem.cpp main.cpp mainwindow.cpp datawindow.cpp sequencewindow.cpp exportwindow.cpp qzint.cpp)
if(USE_QT6) if(USE_QT6)
qt6_wrap_cpp(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h) qt6_wrap_cpp(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h qzint.h)
qt6_wrap_ui(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui) qt6_wrap_ui(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui)
qt6_add_resources(zint-qt_SRCS resources.qrc) qt6_add_resources(zint-qt_SRCS resources.qrc)
else() else()
qt5_wrap_cpp(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h) qt5_wrap_cpp(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h qzint.h)
qt5_wrap_ui(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui) qt5_wrap_ui(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui)
qt5_add_resources(zint-qt_SRCS resources.qrc) qt5_add_resources(zint-qt_SRCS resources.qrc)
endif() endif()
@ -23,9 +23,9 @@ endif()
# grpC39.ui grpCodeOne.ui grpHX.ui grpMSICheck.ui grpUPCA.ui # grpC39.ui grpCodeOne.ui grpHX.ui grpMSICheck.ui grpUPCA.ui
add_executable(zint-qt ${zint-qt_SRCS}) add_executable(zint-qt ${zint-qt_SRCS})
add_dependencies(zint-qt QZint zint) add_dependencies(zint-qt zint)
link_directories( "${CMAKE_BINARY_DIR}/backend" "${CMAKE_BINARY_DIR}/backend_qt" ) link_directories( "${CMAKE_BINARY_DIR}/backend" )
if(USE_QT6) if(USE_QT6)
target_link_libraries(zint-qt zint QZint Qt6::UiTools ${QT_QTXML_LIBRARY} Qt6::Gui Qt6::Core) target_link_libraries(zint-qt zint QZint Qt6::UiTools ${QT_QTXML_LIBRARY} Qt6::Gui Qt6::Core)

2
frontend_qt/barcodeitem.h
View File

@ -18,7 +18,7 @@
#define BARCODEITEM_H #define BARCODEITEM_H
#include <QGraphicsItem> #include <QGraphicsItem>
#include <qzint.h> #include "qzint.h"
/** /**
@author BogDan Vatra <taipan@licentia.eu> @author BogDan Vatra <taipan@licentia.eu>

11
frontend_qt/frontend_qt.pro
View File

@ -12,7 +12,8 @@ HEADERS += barcodeitem.h \
datawindow.h \ datawindow.h \
exportwindow.h \ exportwindow.h \
mainwindow.h \ mainwindow.h \
sequencewindow.h sequencewindow.h \
qzint.h
FORMS += extData.ui \ FORMS += extData.ui \
extExport.ui \ extExport.ui \
@ -50,7 +51,8 @@ SOURCES += barcodeitem.cpp \
exportwindow.cpp \ exportwindow.cpp \
main.cpp \ main.cpp \
mainwindow.cpp \ mainwindow.cpp \
sequencewindow.cpp sequencewindow.cpp \
qzint.cpp
TRANSLATIONS = frontend_de.ts TRANSLATIONS = frontend_de.ts
@ -63,10 +65,9 @@ CONFIG += static
CONFIG += warn_on thread qt CONFIG += warn_on thread qt
INCLUDEPATH += ../backend_qt ../backend INCLUDEPATH += ../backend
LIBS += -lQtZint -lQt5Core LIBS += -lQt5Core
QMAKE_LIBDIR += ../backend_qt/release
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {
# Win # Win

11
frontend_qt/frontend_qt_zintdll.pro
View File

@ -8,7 +8,8 @@ HEADERS += barcodeitem.h \
datawindow.h \ datawindow.h \
exportwindow.h \ exportwindow.h \
mainwindow.h \ mainwindow.h \
sequencewindow.h sequencewindow.h \
qzint.h
FORMS += extData.ui \ FORMS += extData.ui \
extExport.ui \ extExport.ui \
@ -46,14 +47,14 @@ SOURCES += barcodeitem.cpp \
exportwindow.cpp \ exportwindow.cpp \
main.cpp \ main.cpp \
mainwindow.cpp \ mainwindow.cpp \
sequencewindow.cpp sequencewindow.cpp \
qzint.cpp
RESOURCES += resources.qrc RESOURCES += resources.qrc
RC_FILE += res/qtZint.rc RC_FILE += res/qtZint.rc
INCLUDEPATH += ../backend_qt ../backend INCLUDEPATH += ../backend
LIBS += -lQtZintDLL -lzint LIBS += -lzint
QMAKE_LIBDIR += ../backend_qt/release
QMAKE_LIBDIR += ../win32/Release QMAKE_LIBDIR += ../win32/Release

14
frontend_qt/frontend_vc8.pro
View File

@ -14,7 +14,8 @@ HEADERS = mainwindow.h \
barcodeitem.h \ barcodeitem.h \
datawindow.h \ datawindow.h \
exportwindow.h \ exportwindow.h \
sequencewindow.h sequencewindow.h \
qzint.h
SOURCES = main.cpp \ SOURCES = main.cpp \
mainwindow.cpp \ mainwindow.cpp \
@ -22,18 +23,11 @@ SOURCES = main.cpp \
datawindow.cpp \ datawindow.cpp \
exportwindow.cpp \ exportwindow.cpp \
sequencewindow.cpp sequencewindow.cpp
qzint.cpp
RESOURCES = resources.qrc RESOURCES = resources.qrc
INCLUDEPATH += ../backend_qt4 ../backend INCLUDEPATH += ../backend
CONFIG(debug, debug|release) {
LIBPATH += ../backend_qt4/debug
}
CONFIG(release, debug|release) {
LIBPATH += ../backend_qt4/release
}
RC_FILE = ./res/qtZint.rc RC_FILE = ./res/qtZint.rc

0
backend_qt/qzint.cpp → frontend_qt/qzint.cpp
View File

0
backend_qt/qzint.h → frontend_qt/qzint.h
View File