mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 08:34:38 +03:00
Finish 1.4.104
This commit is contained in:
commit
9182950b35
@ -1,2 +0,0 @@
|
||||
TOP_SRC_DIR=$$PWD
|
||||
TOP_BUILD_DIR=$$OUT_PWD
|
@ -1,2 +0,0 @@
|
||||
TOP_SRC_DIR=$$PWD
|
||||
TOP_BUILD_DIR=$$shadowed($$PWD)
|
14
common.pri
14
common.pri
@ -1,7 +1,13 @@
|
||||
!contains(CONFIG, config_build_dir){
|
||||
isEmpty(TOP_BUILD_DIR) {
|
||||
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){
|
||||
CONFIG += build_translations
|
||||
}
|
||||
@ -30,12 +36,6 @@ CONFIG(release, debug|release){
|
||||
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}
|
||||
|
||||
DEST_INCLUDE_DIR = $$PWD/include
|
||||
|
@ -1,3 +0,0 @@
|
||||
TEMPLATE=subdirs
|
||||
SUBDIRS= # don't build anything, we're just generating the .qmake.cache file
|
||||
QMAKE_SUBSTITUTES += .qmake.cache.in
|
@ -13,16 +13,8 @@ export($$CONFIG)
|
||||
|
||||
CONFIG += ordered
|
||||
SUBDIRS += \
|
||||
initvars.pro \
|
||||
limereport \
|
||||
demo_r1 \
|
||||
demo_r2 \
|
||||
designer
|
||||
|
||||
# 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
|
||||
|
Loading…
Reference in New Issue
Block a user