python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.99

Browse Source
This commit is contained in:
Arin Alex 2018-08-10 02:26:30 +03:00
commit d162c2e6a3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common.pri
View File

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

5
demo_r1/demo_r1.pro
View File

@ -46,7 +46,7 @@ unix:{
}
DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
linux{
#Link share lib to ../lib rpath
@ -67,7 +67,8 @@ win32 {
DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
#QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
!contains(CONFIG, static_build){
contains(CONFIG,zint){