mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 16:39:07 +03:00
Code Activity

Merge branch '1.4'

Browse Source 
# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h
This commit is contained in:
Arin Alexander
2017-03-01 00:40:36 +03:00
parent 034f254d5c e9957bd8b5
commit ddc793f6e4
126 changed files with 8954 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common.pri
View File

@@ -1,5 +1,13 @@
CONFIG += build_translations
CONFIG += zint
greaterThan(QT_MAJOR_VERSION, 4) {
QT += uitools
}
lessThan(QT_MAJOR_VERSION, 5){
CONFIG += uitools
}
ZINT_PATH = $$PWD/3rdparty/zint-2.4.4
CONFIG(release, debug|release){
@@ -47,8 +55,8 @@ OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj
RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 3
LIMEREPORT_VERSION_RELEASE = 12
LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 1
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"