mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 00:18:06 +03:00
Code Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	common.pri
#	limereport.pro
#	limereport/limereport.pro
This commit is contained in:
Arin Alexander
2018-08-06 19:58:56 +03:00
parent 0fa2896fa0 c2dab351cb
commit 9c358278b6
8 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common.pri
View File

@@ -1,4 +1,6 @@
CONFIG *= build_translations
!contains(CONFIG, no_build_translations){
CONFIG += build_translations
}
#CONFIG *= easy_profiler
!contains(CONFIG, no_zint){
@@ -67,7 +69,12 @@ CONFIG(release, debug|release){
BUILD_TYPE = debug
}
BUILD_DIR = $$PWD/build/$${QT_VERSION}
isEmpty(TOP_BUILD_DIR) {
BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
}else{
BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
}
DEST_INCLUDE_DIR = $$PWD/include
unix{
ARCH_DIR = $${OUT_PWD}/unix