mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Code

Merge pull request #337 from darktorres/master

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/3rdparty.pro vendored
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
INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt
DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt

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

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

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

15
console/console.pro
View File

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

60
demo_r1/demo_r1.pro
View File

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

2
demo_r1/main.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
demo_r1/mainwindow.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
demo_r1/mainwindow.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

50
demo_r2/demo_r2.pro
View File

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

27
designer/designer.pro
View File

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

30
designer_plugin/designer_plugin.pro
View File

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

2
include/lrdatasourcemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
include/lrglobal.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
include/lrglobal.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
include/lrreportengine.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
include/lrscriptenginemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

24
limereport.pro
View File

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

2
limereport/bands/lrdataband.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrdataband.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrgroupbands.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrgroupbands.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpagefooter.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpagefooter.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpageheader.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpageheader.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportfooter.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportfooter.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportheader.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportheader.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrsubdetailband.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/bands/lrsubdetailband.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/base/lrattribsabstractfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/base/lrsimpleabstractfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/base/lrsingleton.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrconnectiondialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrconnectiondialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowser.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowser.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowsertree.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowsertree.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrsqleditdialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrsqleditdialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrvariabledialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrvariabledialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

11
limereport/designer.pri
View File

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

12
limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri vendored
View File

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

18
limereport/dialogdesigner/dialogdesigner.pri
View File

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

2
limereport/items/editors/lrfonteditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrfonteditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemeditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemeditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsaligneditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsaligneditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsborderseditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsborderseditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrtextalignmenteditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrtextalignmenteditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lralignpropitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lralignpropitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrbarcodeitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrbarcodeitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrhorizontallayout.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrhorizontallayout.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrimageitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrimageitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrshapeitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrshapeitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrsimpletagparser.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrsimpletagparser.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrsubitemparentpropitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrsubitemparentpropitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitemeditor.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitemeditor.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

18
limereport/limereport.pri
View File

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

44
limereport/limereport.pro
View File

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

2
limereport/lraboutdialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lraboutdialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lraboutdialog.ui
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=" 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>
&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>
</widget>
</item>

2
limereport/lrbanddesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrbanddesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrbandsmanager.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrbandsmanager.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrbasedesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrbasedesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrcollection.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdatadesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdatadesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanager.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanager.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrdesignelementsfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrglobal.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrglobal.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrgroupfunctions.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrgroupfunctions.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lritemdesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lritemdesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

2
limereport/lrpagedesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* 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 *
* *
** GNU General Public License Usage **

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