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

Merge pull request #337 from darktorres/master

Some more small changes
This commit is contained in:
Alexander Arin 2021-08-19 02:28:10 +03:00 committed by GitHub
commit 09a31a96a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
184 changed files with 406 additions and 411 deletions

View File

@ -1,4 +1,4 @@
ZINT_PATH = $$PWD/zint-2.6.1/ ZINT_PATH = $$PWD/zint-2.6.1
ZINT_VERSION = 2.6.1 ZINT_VERSION = 2.6.1
INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt
DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt

View File

@ -1,13 +1,13 @@
DEFINES += NO_PNG DEFINES += NO_PNG
TEMPLATE = lib TEMPLATE = lib
contains(CONFIG, static_build){ CONFIG(static_build) {
message(Static Build) message(Static Build)
CONFIG += staticlib CONFIG += staticlib
DEFINES += QZINT_STATIC_BUILD DEFINES += QZINT_STATIC_BUILD
} }
!contains(CONFIG, staticlib){ !CONFIG(staticlib) {
CONFIG += dll CONFIG += dll
DEFINES += QZINT_LIBRARY DEFINES += QZINT_LIBRARY
} }
@ -27,10 +27,10 @@ INCLUDEPATH += $$PWD/../backend
DEFINES += ZINT_VERSION=\\\"$$ZINT_VERSION\\\" DEFINES += ZINT_VERSION=\\\"$$ZINT_VERSION\\\"
CONFIG(release, debug|release){ CONFIG(release, debug|release) {
TARGET = QtZint TARGET = QtZint
} else { } else {
TARGET = QtZintd TARGET = QtZintd
} }
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {
@ -40,28 +40,28 @@ CONFIG(release, debug|release){
INCLUDEPATH += zint zint/backend zint/backend_qt INCLUDEPATH += zint zint/backend zint/backend_qt
HEADERS += $$PWD/../backend/aztec.h \ HEADERS += $$PWD/../backend/aztec.h \
$$PWD/../backend/bmp.h \ $$PWD/../backend/bmp.h \
$$PWD/../backend/code49.h \ $$PWD/../backend/code49.h \
$$PWD/../backend/common.h \ $$PWD/../backend/common.h \
$$PWD/../backend/composite.h \ $$PWD/../backend/composite.h \
$$PWD/../backend/dmatrix.h \ $$PWD/../backend/dmatrix.h \
$$PWD/../backend/eci.h \ $$PWD/../backend/eci.h \
$$PWD/../backend/font.h \ $$PWD/../backend/font.h \
$$PWD/../backend/gridmtx.h \ $$PWD/../backend/gridmtx.h \
$$PWD/../backend/gs1.h \ $$PWD/../backend/gs1.h \
$$PWD/../backend/hanxin.h \ $$PWD/../backend/hanxin.h \
$$PWD/../backend/large.h \ $$PWD/../backend/large.h \
$$PWD/../backend/maxicode.h \ $$PWD/../backend/maxicode.h \
$$PWD/../backend/pcx.h \ $$PWD/../backend/pcx.h \
$$PWD/../backend/pdf417.h \ $$PWD/../backend/pdf417.h \
$$PWD/../backend/reedsol.h \ $$PWD/../backend/reedsol.h \
$$PWD/../backend/rss.h \ $$PWD/../backend/rss.h \
$$PWD/../backend/sjis.h \ $$PWD/../backend/sjis.h \
$$PWD/../backend/stdint_msvc.h \ $$PWD/../backend/stdint_msvc.h \
$$PWD/../backend/zint.h \ $$PWD/../backend/zint.h \
$$PWD/qzint.h \ $$PWD/qzint.h \
$$PWD/qzint_global.h $$PWD/qzint_global.h
SOURCES += $$PWD/../backend/2of5.c \ SOURCES += $$PWD/../backend/2of5.c \
$$PWD/../backend/auspost.c \ $$PWD/../backend/auspost.c \

View File

@ -1,66 +1,76 @@
# uncomment to disable translations
#CONFIG += no_build_translations
# uncomment to disable zint
#CONFIG += no_zint
# uncomment to disable svg
#CONFIG += no_svg
# uncomment to enable easy_profiler
#CONFIG *= easy_profiler
isEmpty(BINARY_RESULT_DIR) { isEmpty(BINARY_RESULT_DIR) {
BINARY_RESULT_DIR = $${PWD} BINARY_RESULT_DIR = $${PWD}
} }
!contains(CONFIG, no_build_translations){ !CONFIG(no_build_translations) {
CONFIG += build_translations CONFIG *= build_translations
} }
#CONFIG *= easy_profiler
!contains(CONFIG, no_zint){ !CONFIG(no_zint) {
CONFIG *= zint CONFIG *= zint
} }
!contains(CONGIG, no_svg){ !CONFIG(no_svg) {
QT *= svg QT *= svg
CONFIG *= svg CONFIG *= svg
DEFINES += HAVE_SVG DEFINES *= HAVE_SVG
} }
INCLUDEPATH += $$PWD/3rdparty/easyprofiler/easy_profiler_core/include CONFIG(easy_profiler) {
DEPENDPATH += $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
contains(CONFIG, easy_profiler){
message(EasyProfiler) message(EasyProfiler)
unix|win32: LIBS += -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler INCLUDEPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
greaterThan(QT_MAJOR_VERSION, 4){ DEPENDPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
DEFINES += BUILD_WITH_EASY_PROFILER unix|win32: LIBS *= -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler
greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES *= BUILD_WITH_EASY_PROFILER
} }
} }
!contains(CONFIG, qtscriptengine){ !CONFIG(qtscriptengine) {
greaterThan(QT_MAJOR_VERSION, 4){ greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MINOR_VERSION, 5){ greaterThan(QT_MINOR_VERSION, 5) {
CONFIG *= qjsengine CONFIG *= qjsengine
} }
lessThan(QT_MINOR_VERSION, 6){ lessThan(QT_MINOR_VERSION, 6) {
CONFIG *= qtscriptengine CONFIG *= qtscriptengine
} }
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5) {
CONFIG *= qtscriptengine CONFIG *= qtscriptengine
} }
} }
contains(CONFIG, qtscriptengine){ CONFIG(qtscriptengine) {
CONFIG -= qjsengine CONFIG -= qjsengine
QT *= script QT *= script
DEFINES *= USE_QTSCRIPTENGINE DEFINES *= USE_QTSCRIPTENGINE
message(qtscriptengine) message(qtscriptengine)
} }
!contains(CONFIG, no_formdesigner){ !CONFIG(no_formdesigner) {
CONFIG *= dialogdesigner CONFIG *= dialogdesigner
} }
!contains(CONFIG, no_embedded_designer){ !CONFIG(no_embedded_designer) {
CONFIG *= embedded_designer CONFIG *= embedded_designer
DEFINES += HAVE_REPORT_DESIGNER DEFINES *= HAVE_REPORT_DESIGNER
message(embedded designer) message(embedded designer)
} }
ZINT_PATH = $$PWD/3rdparty/zint-2.6.1 ZINT_PATH = $$PWD/3rdparty/zint-2.6.1
contains(CONFIG,zint){ CONFIG(zint) {
DEFINES *= HAVE_ZINT DEFINES *= HAVE_ZINT
} }
@ -68,11 +78,11 @@ greaterThan(QT_MAJOR_VERSION, 4) {
QT *= uitools QT *= uitools
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5) {
CONFIG *= uitools CONFIG *= uitools
} }
CONFIG(release, debug|release){ CONFIG(release, debug|release) {
message(Release) message(Release)
BUILD_TYPE = release BUILD_TYPE = release
}else{ }else{
@ -83,39 +93,43 @@ CONFIG(release, debug|release){
BUILD_DIR = $${BINARY_RESULT_DIR}/build/$${QT_VERSION} BUILD_DIR = $${BINARY_RESULT_DIR}/build/$${QT_VERSION}
DEST_INCLUDE_DIR = $$PWD/include DEST_INCLUDE_DIR = $$PWD/include
unix{ unix{
ARCH_DIR = $${OUT_PWD}/unix ARCH_DIR = $${OUT_PWD}/unix
ARCH_TYPE = unix ARCH_TYPE = unix
macx{ macx{
ARCH_DIR = $${OUT_PWD}/macx ARCH_DIR = $${OUT_PWD}/macx
ARCH_TYPE = macx ARCH_TYPE = macx
} }
linux{ linux{
!contains(QT_ARCH, x86_64){ !contains(QT_ARCH, x86_64) {
message("Compiling for 32bit system") message("Compiling for 32bit system")
ARCH_DIR = $${OUT_PWD}/linux32 ARCH_DIR = $${OUT_PWD}/linux32
ARCH_TYPE = linux32 ARCH_TYPE = linux32
}else{ }else{
message("Compiling for 64bit system") message("Compiling for 64bit system")
ARCH_DIR = $${OUT_PWD}/linux64 ARCH_DIR = $${OUT_PWD}/linux64
ARCH_TYPE = linux64 ARCH_TYPE = linux64
} }
} }
} }
win32 { win32 {
!contains(QT_ARCH, x86_64) { !contains(QT_ARCH, x86_64) {
message("Compiling for 32bit system") message("Compiling for 32bit system")
ARCH_DIR = $${OUT_PWD}/win32 ARCH_DIR = $${OUT_PWD}/win32
ARCH_TYPE = win32 ARCH_TYPE = win32
} else { } else {
message("Compiling for 64bit system") message("Compiling for 64bit system")
ARCH_DIR = $${OUT_PWD}/win64 ARCH_DIR = $${OUT_PWD}/win64
ARCH_TYPE = win64 ARCH_TYPE = win64
} }
} }
DEST_LIBS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib DEST_LIBS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
DEST_BINS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/$${TARGET} DEST_BINS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/$${TARGET}
MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc
UI_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui UI_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui
@ -139,20 +153,20 @@ TRANSLATIONS_PATH = $$PWD/translations
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES *= HAVE_QT5 DEFINES *= HAVE_QT5
QT *= printsupport widgets QT *= printsupport widgets
contains(QT,uitools){ contains(QT, uitools) {
message(uitools) message(uitools)
DEFINES *= HAVE_UI_LOADER DEFINES *= HAVE_UI_LOADER
} }
contains(CONFIG, qjsengine){ CONFIG(qjsengine) {
message(qjsengine) message(qjsengine)
DEFINES *= USE_QJSENGINE DEFINES *= USE_QJSENGINE
QT *= qml QT *= qml
} }
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5) {
DEFINES *= HAVE_QT4 DEFINES *= HAVE_QT4
CONFIG(uitools){ CONFIG(uitools) {
message(uitools) message(uitools)
DEFINES *= HAVE_UI_LOADER DEFINES *= HAVE_UI_LOADER
} }

View File

@ -23,13 +23,12 @@ CONFIG(debug, debug|release) {
} else { } else {
LIBS += -llimereport LIBS += -llimereport
} }
!contains(CONFIG, static_build){
contains(CONFIG,zint){ !CONFIG(static_build) : CONFIG(zint) {
LIBS += -L$${DEST_LIBS} LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += -lQtZintd LIBS += -lQtZintd
} else { } else {
LIBS += -lQtZint LIBS += -lQtZint
}
} }
} }

View File

@ -2,56 +2,56 @@ include(../common.pri)
QT += core gui QT += core gui
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
TARGET = LRDemo_r1 TARGET = LRDemo_r1
} else { } else {
TARGET = LRDemo_r1d TARGET = LRDemo_r1d
} }
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp\ SOURCES += main.cpp \
mainwindow.cpp mainwindow.cpp
HEADERS += mainwindow.h HEADERS += mainwindow.h
FORMS += mainwindow.ui FORMS += mainwindow.ui
INCLUDEPATH += $$PWD/../include INCLUDEPATH += $$PWD/../include
DEPENDPATH += $$PWD/../include DEPENDPATH += $$PWD/../include
RESOURCES += \ RESOURCES += \
r1.qrc r1.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${DEST_BINS} DEST_DIR = $${DEST_BINS}
REPORTS_DIR = $${DEST_DIR} REPORTS_DIR = $${DEST_DIR}
macx{ macx{
CONFIG += app_bundle CONFIG += app_bundle
} }
unix:{ unix:{
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
linux{ linux{
#Link share lib to ../lib rpath #Link share lib to ../lib rpath
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
QMAKE_LFLAGS_RPATH += #. .. ./libs QMAKE_LFLAGS_RPATH += #. .. ./libs
} }
target.path = $${DEST_DIR} target.path = $${DEST_DIR}
INSTALLS = target INSTALLS = target
} }
win32 { win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
contains(QMAKE_HOST.os, Linux){ contains(QMAKE_HOST.os, Linux) {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
} else { } else {
EXTRA_DIR ~= s,/,\\,g EXTRA_DIR ~= s,/,\\,g
DEST_DIR ~= s,/,\\,g DEST_DIR ~= s,/,\\,g
REPORTS_DIR ~= s,/,\\,g REPORTS_DIR ~= s,/,\\,g
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
@ -67,13 +67,11 @@ CONFIG(debug, debug|release) {
} }
message($$LIBS) message($$LIBS)
!contains(CONFIG, static_build){ !CONFIG(static_build) : CONFIG(zint) {
contains(CONFIG,zint){ LIBS += -L$${DEST_LIBS}
LIBS += -L$${DEST_LIBS} CONFIG(debug, debug|release) {
CONFIG(debug, debug|release) { LIBS += -lQtZintd
LIBS += -lQtZintd } else {
} else { LIBS += -lQtZint
LIBS += -lQtZint }
}
}
} }

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,16 +1,16 @@
include(../common.pri) include(../common.pri)
QT += core gui QT += core gui
CONFIG(release, debug|release){ CONFIG(release, debug|release) {
TARGET = LRDemo_r2 TARGET = LRDemo_r2
} else { } else {
TARGET = LRDemo_r2d TARGET = LRDemo_r2d
} }
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp\ SOURCES += main.cpp \
mainwindow.cpp mainwindow.cpp
HEADERS += mainwindow.h HEADERS += mainwindow.h
@ -20,7 +20,7 @@ INCLUDEPATH += $$PWD/../include
DEPENDPATH += $$PWD/../include DEPENDPATH += $$PWD/../include
RESOURCES += \ RESOURCES += \
demo_r2.qrc demo_r2.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
@ -34,26 +34,26 @@ macx{
unix:{ unix:{
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
linux{ linux{
#Link share lib to ../lib rpath #Link share lib to ../lib rpath
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
QMAKE_LFLAGS_RPATH += #. .. ./libs QMAKE_LFLAGS_RPATH += #. .. ./libs
} }
target.path = $${DEST_DIR} target.path = $${DEST_DIR}
INSTALLS = target INSTALLS = target
} }
win32 { win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
contains(QMAKE_HOST.os, Linux){ contains(QMAKE_HOST.os, Linux) {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
} else { } else {
EXTRA_DIR ~= s,/,\\,g EXTRA_DIR ~= s,/,\\,g
DEST_DIR ~= s,/,\\,g DEST_DIR ~= s,/,\\,g
REPORTS_DIR ~= s,/,\\,g REPORTS_DIR ~= s,/,\\,g
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
} }
} }
@ -65,13 +65,11 @@ CONFIG(debug, debug|release) {
LIBS += -llimereport LIBS += -llimereport
} }
!contains(CONFIG, static_build){ !CONFIG(static_build) : CONFIG(zint) {
contains(CONFIG,zint){ LIBS += -L$${DEST_LIBS}
LIBS += -L$${DEST_LIBS} CONFIG(debug, debug|release) {
CONFIG(debug, debug|release) { LIBS += -lQtZintd
LIBS += -lQtZintd } else {
} else { LIBS += -lQtZint
LIBS += -lQtZint }
}
}
} }

View File

@ -1,18 +1,19 @@
include(../common.pri) include(../common.pri)
QT += core gui QT += core gui
contains(CONFIG,release) { CONFIG(release) {
TARGET = LRDesigner TARGET = LRDesigner
} else { } else {
TARGET = LRDesignerd TARGET = LRDesignerd
} }
TEMPLATE = app TEMPLATE = app
HEADERS += \ HEADERS += \
designersettingmanager.h designersettingmanager.h
SOURCES += main.cpp \ SOURCES += main.cpp \
designersettingmanager.cpp designersettingmanager.cpp
INCLUDEPATH += $$PWD/../include INCLUDEPATH += $$PWD/../include
DEPENDPATH += $$PWD/../include DEPENDPATH += $$PWD/../include
@ -51,17 +52,15 @@ win32 {
LIBS += -L$${DEST_LIBS} LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += -llimereportd LIBS += -llimereportd
} else { } else {
LIBS += -llimereport LIBS += -llimereport
} }
!contains(CONFIG, static_build){ !CONFIG(static_build) : CONFIG(zint) {
contains(CONFIG,zint){ CONFIG(debug, debug|release) {
CONFIG(debug, debug|release) { LIBS += -L$${DEST_LIBS} -lQtZintd
LIBS += -L$${DEST_LIBS} -lQtZintd } else {
} else { LIBS += -L$${DEST_LIBS} -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
} }

View File

@ -4,43 +4,43 @@ include(../common.pri)
include(../limereport/limereport.pri) include(../limereport/limereport.pri)
include(../limereport/designer.pri) include(../limereport/designer.pri)
contains(CONFIG,release) { CONFIG(release) {
TARGET = designer_plugin TARGET = designer_plugin
} else { } else {
TARGET = designer_plugind TARGET = designer_plugind
} }
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
HEADERS += \ HEADERS += \
lrdesignerplugin.h lrdesignerplugin.h
SOURCES += \ SOURCES += \
lrdesignerplugin.cpp lrdesignerplugin.cpp
INCLUDEPATH += $$PWD/../include INCLUDEPATH += $$PWD/../include
DEPENDPATH += $$PWD/../include DEPENDPATH += $$PWD/../include
macx{ macx{
CONFIG += lib_bundle CONFIG += lib_bundle
CONFIG += -dll CONFIG += -dll
} }
DESTDIR = $${DEST_LIBS} DESTDIR = $${DEST_LIBS}
unix { unix {
target.path = $${DESTDIR} target.path = $${DESTDIR}
INSTALLS = target INSTALLS = target
} }
contains(CONFIG,zint){ CONFIG(zint) {
message(zint) message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
LIBS += -L$${DEST_LIBS} LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release){ CONFIG(debug, debug|release) {
LIBS += -lQtZintd LIBS += -lQtZintd
} else { } else {
LIBS += -lQtZint LIBS += -lQtZint
} }
} }

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,31 +1,23 @@
TEMPLATE = subdirs TEMPLATE = subdirs
!contains(CONFIG, no_zint){
CONFIG += zint
}
include(common.pri) include(common.pri)
contains(CONFIG, zint){
CONFIG += ordered
CONFIG(zint) {
SUBDIRS += 3rdparty SUBDIRS += 3rdparty
} }
export($$CONFIG)
CONFIG += ordered
SUBDIRS += \ SUBDIRS += \
limereport \ limereport \
demo_r1 \ demo_r1 \
demo_r2 \ demo_r2 \
designer designer
greaterThan(QT_MAJOR_VERSION, 4){ greaterThan(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 1) {
greaterThan(QT_MINOR_VERSION, 1){ SUBDIRS += console
SUBDIRS += console
}
} }
!contains(CONFIG, embedded_designer){ !CONFIG(embedded_designer) : !CONFIG(static_build) {
!contains(CONFIG, static_build){ SUBDIRS += designer_plugin
SUBDIRS += designer_plugin
}
} }

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,8 +1,9 @@
include(../common.pri) include(../common.pri)
DEFINES+=HAVE_REPORT_DESIGNER
contains(CONFIG,dialogdesigner){ DEFINES += HAVE_REPORT_DESIGNER
include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
CONFIG(dialogdesigner) {
include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
} }
INCLUDEPATH += $$REPORT_PATH/objectinspector \ INCLUDEPATH += $$REPORT_PATH/objectinspector \
@ -51,7 +52,7 @@ SOURCES += \
$$REPORT_PATH/lrreportdesignwidget.cpp \ $$REPORT_PATH/lrreportdesignwidget.cpp \
$$REPORT_PATH/lrreportdesignwindow.cpp $$REPORT_PATH/lrreportdesignwindow.cpp
contains(CONFIG, svg){ CONFIG(svg) {
SOURCES += \ SOURCES += \
$$REPORT_PATH/objectinspector/editors/lrsvgeditor.cpp \ $$REPORT_PATH/objectinspector/editors/lrsvgeditor.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.cpp $$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.cpp
@ -100,7 +101,7 @@ HEADERS += \
$$REPORT_PATH/lrreportdesignwidget.h \ $$REPORT_PATH/lrreportdesignwidget.h \
$$REPORT_PATH/lrreportdesignwindow.h $$REPORT_PATH/lrreportdesignwindow.h
contains(CONFIG, svg){ contains(CONFIG, svg) {
HEADERS += \ HEADERS += \
$$REPORT_PATH/objectinspector/editors/lrsvgeditor.h \ $$REPORT_PATH/objectinspector/editors/lrsvgeditor.h \
$$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.h $$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.h

View File

@ -1,11 +1,11 @@
INCLUDEPATH *= $$PWD $$PWD/.. INCLUDEPATH *= $$PWD $$PWD/..
SOURCES += $$PWD/widgethost.cpp \ SOURCES += $$PWD/widgethost.cpp \
$$PWD/sizehandlerect.cpp \ $$PWD/sizehandlerect.cpp \
$$PWD/formresizer.cpp $$PWD/formresizer.cpp
HEADERS += $$PWD/widgethost.h \ HEADERS += $$PWD/widgethost.h \
$$PWD/sizehandlerect.h \ $$PWD/sizehandlerect.h \
$$PWD/formresizer.h \ $$PWD/formresizer.h \
$$PWD/widgethostconstants.h \ $$PWD/widgethostconstants.h \
$$PWD/../namespace_global.h $$PWD/../namespace_global.h

View File

@ -1,27 +1,25 @@
include(../../common.pri) include(../../common.pri)
include($$PWD/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri) include($$PWD/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri)
INCLUDEPATH *= $$PWD/3rdparty/designer INCLUDEPATH *= $$PWD/3rdparty/designer
greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT,uitools){ greaterThan(QT_MAJOR_VERSION, 4) : contains(QT, uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
} }
lessThan(QT_MAJOR_VERSION, 5){
contains(CONFIG,uitools){ lessThan(QT_MAJOR_VERSION, 5) : CONFIG(uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
} }
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT *= designer designercomponents-private QT *= designer designercomponents-private
} else { } else {
CONFIG *= designer CONFIG *= designer
qtAddLibrary( QtDesignerComponents ) qtAddLibrary(QtDesignerComponents)
} }
SOURCES += $$PWD/lrdialogdesigner.cpp SOURCES += $$PWD/lrdialogdesigner.cpp
HEADERS += $$PWD/lrdialogdesigner.h HEADERS += $$PWD/lrdialogdesigner.h
RESOURCES += \ RESOURCES += \
$$PWD/dialogdesigner.qrc $$PWD/dialogdesigner.qrc

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
include(../common.pri) include(../common.pri)
contains(CONFIG, embedded_designer){ contains(CONFIG, embedded_designer) {
include(designer.pri) include(designer.pri)
message(embedded designer) message(embedded designer)
} }
@ -76,17 +76,16 @@ SOURCES += \
$$REPORT_PATH/exporters/lrpdfexporter.cpp \ $$REPORT_PATH/exporters/lrpdfexporter.cpp \
$$REPORT_PATH/lrpreparedpages.cpp $$REPORT_PATH/lrpreparedpages.cpp
CONFIG(staticlib) {
contains(CONFIG, staticlib){
SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
} }
contains(CONFIG, zint){ CONFIG(zint) {
SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
} }
contains(CONFIG, svg){ CONFIG(svg) {
SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \ SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \
} }
HEADERS += \ HEADERS += \
@ -171,15 +170,15 @@ HEADERS += \
$$REPORT_PATH/lrpreparedpages.h \ $$REPORT_PATH/lrpreparedpages.h \
$$REPORT_PATH/lrpreparedpagesintf.h $$REPORT_PATH/lrpreparedpagesintf.h
contains(CONFIG, staticlib){ CONFIG(staticlib) {
HEADERS += $$REPORT_PATH/lrfactoryinitializer.h HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
} }
contains(CONFIG,zint){ CONFIG(zint) {
HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
} }
contains(CONFIG, svg){ CONFIG(svg) {
HEADERS += $$REPORT_PATH/items/lrsvgitem.h HEADERS += $$REPORT_PATH/items/lrsvgitem.h
} }
@ -196,4 +195,3 @@ FORMS += \
RESOURCES += \ RESOURCES += \
$$REPORT_PATH/report.qrc \ $$REPORT_PATH/report.qrc \
$$REPORT_PATH/items/items.qrc $$REPORT_PATH/items/items.qrc

View File

@ -1,4 +1,4 @@
CONFIG(debug, debug|release){ CONFIG(debug, debug|release) {
TARGET = limereportd TARGET = limereportd
} else { } else {
TARGET = limereport TARGET = limereport
@ -6,11 +6,11 @@ CONFIG(debug, debug|release){
TEMPLATE = lib TEMPLATE = lib
contains(CONFIG, static_build){ CONFIG(static_build) {
CONFIG += staticlib CONFIG += staticlib
} }
!contains(CONFIG, staticlib){ !CONFIG(staticlib) {
CONFIG += lib CONFIG += lib
CONFIG += dll CONFIG += dll
} }
@ -19,14 +19,14 @@ CONFIG += create_prl
CONFIG += link_prl CONFIG += link_prl
macx{ macx{
CONFIG -= dll CONFIG -= dll
CONFIG += lib_bundle CONFIG += lib_bundle
CONFIG += plugin CONFIG += plugin
} }
DEFINES += LIMEREPORT_EXPORTS DEFINES += LIMEREPORT_EXPORTS
contains(CONFIG, staticlib){ CONFIG(staticlib) {
DEFINES += HAVE_STATIC_BUILD DEFINES += HAVE_STATIC_BUILD
DEFINES += QZINT_STATIC_BUILD DEFINES += QZINT_STATIC_BUILD
message(STATIC_BUILD) message(STATIC_BUILD)
@ -47,15 +47,15 @@ EXTRA_FILES += \
include(limereport.pri) include(limereport.pri)
unix:{ unix:{
DESTDIR = $${DEST_LIBS} DESTDIR = $${DEST_LIBS}
linux{ linux{
QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
} }
} }
macx{ macx{
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
} }
QMAKE_POST_LINK += mkdir -p \"$${DESTDIR}/include\" $$escape_expand(\\n\\t) QMAKE_POST_LINK += mkdir -p \"$${DESTDIR}/include\" $$escape_expand(\\n\\t)
@ -65,9 +65,9 @@ unix:{
win32 { win32 {
DESTDIR = $${DEST_LIBS} DESTDIR = $${DEST_LIBS}
contains(QMAKE_HOST.os, Linux){ contains(QMAKE_HOST.os, Linux) {
QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
} }
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\" QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
@ -78,23 +78,23 @@ win32 {
DEST_DIR ~= s,/,\\,g DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g DEST_INCLUDE_DIR ~= s,/,\\,g
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
} }
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\" QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
} }
} }
contains(CONFIG,zint){ CONFIG(zint) {
message(zint) message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
LIBS += -L$${DEST_LIBS} LIBS += -L$${DEST_LIBS}
CONFIG(release, debug|release){ CONFIG(release, debug|release) {
LIBS += -lQtZint LIBS += -lQtZint
} else { } else {
LIBS += -lQtZintd LIBS += -lQtZintd
} }
} }
#### Install mkspecs, headers and libs to QT_INSTALL_DIR #### Install mkspecs, headers and libs to QT_INSTALL_DIR
@ -112,7 +112,7 @@ INSTALLS += target
####Automatically build required translation files (*.qm) ####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){ CONFIG(build_translations) {
LANGUAGES = ru es ar fr zh pl LANGUAGES = ru es ar fr zh pl
defineReplace(prependAll) { defineReplace(prependAll) {
@ -139,5 +139,3 @@ contains(CONFIG,build_translations){
} }
#### EN AUTOMATIC TRANSLATIONS #### EN AUTOMATIC TRANSLATIONS

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -42,7 +42,7 @@ p, li { white-space: pre-wrap; }
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p> <p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p>
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</span></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</span></p>
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600; color:#000000;"><br /></p> <p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600; color:#000000;"><br /></p>
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Copyright 2015 Arin Alexander. All rights reserved.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Copyright 2021 Arin Alexander. All rights reserved.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* This file is part of the Lime Report project * * This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin * * Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru * * arin_a@bk.ru *
* * * *
** GNU General Public License Usage ** ** GNU General Public License Usage **

Some files were not shown because too many files have changed in this diff Show More