mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.99

Browse Source 
# Conflicts:
#	common.pri
#	demo_r1/demo_r1.pro
This commit is contained in:
Arin Alex 2018-08-10 02:30:42 +03:00
commit e38986b38d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common.pri
View File

@ -1,3 +1,7 @@
!contains(CONFIG, config_build_dir){
TOP_BUILD_DIR = $${PWD}
}
!contains(CONFIG, no_build_translations){ !contains(CONFIG, no_build_translations){
CONFIG += build_translations CONFIG += build_translations
} }
@ -69,11 +73,13 @@ CONFIG(release, debug|release){
BUILD_TYPE = debug BUILD_TYPE = debug
} }
isEmpty(TOP_BUILD_DIR) { #isEmpty(TOP_BUILD_DIR) {
BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION} # BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
}else{ #}else{
# BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
#}
BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION} BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
}
DEST_INCLUDE_DIR = $$PWD/include DEST_INCLUDE_DIR = $$PWD/include
unix{ unix{
@ -112,7 +118,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 98 LIMEREPORT_VERSION_RELEASE = 99
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"