python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-23 20:22:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.104

Browse Source 
# Conflicts:
#	limereport.pro
This commit is contained in:
Arin Alexander 2018-09-22 12:36:24 +03:00
commit c657136a1e
5 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.cache.in
View File

@ -1,2 +0,0 @@
TOP_SRC_DIR=$$PWD
TOP_BUILD_DIR=$$OUT_PWD

2
.qmake.conf
View File

@ -1,2 +0,0 @@
TOP_SRC_DIR=$$PWD
TOP_BUILD_DIR=$$shadowed($$PWD)

14
common.pri
View File

@ -1,7 +1,13 @@
!contains(CONFIG, config_build_dir){ isEmpty(TOP_BUILD_DIR) {
TOP_BUILD_DIR = $${PWD} TOP_BUILD_DIR = $${PWD}
} }
message(TOP_BUILD_DIR: $$TOP_BUILD_DIR)
#!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
} }
@ -73,12 +79,6 @@ CONFIG(release, debug|release){
BUILD_TYPE = debug BUILD_TYPE = debug
} }
#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} BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
DEST_INCLUDE_DIR = $$PWD/include DEST_INCLUDE_DIR = $$PWD/include

3
initvars.pro
View File

@ -1,3 +0,0 @@
TEMPLATE=subdirs
SUBDIRS= # don't build anything, we're just generating the .qmake.cache file
QMAKE_SUBSTITUTES += .qmake.cache.in

9
limereport.pro
View File

@ -13,7 +13,6 @@ export($$CONFIG)
CONFIG += ordered CONFIG += ordered
SUBDIRS += \ SUBDIRS += \
initvars.pro \
limereport \ limereport \
demo_r1 \ demo_r1 \
demo_r2 \ demo_r2 \
@ -24,11 +23,3 @@ SUBDIRS += \
SUBDIRS += designer_plugin SUBDIRS += designer_plugin
} }
} }
# QMake top level srcdir and builddir
# https://wiki.qt.io/QMake-top-level-srcdir-and-builddir
#Qt4 .qmake.cache.in
#Qt5 .qmake.conf
OTHER_FILES += \
.qmake.conf \
.qmake.cache.in