python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-09 14:04:44 +03:00
Code Issues Packages Projects Releases Wiki 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

14
limereport/limereport.pro
View File

@@ -33,7 +33,6 @@ contains(CONFIG, staticlib){
}
EXTRA_FILES += \
$$PWD/lrglobal.cpp \
$$PWD/lrglobal.h \
$$PWD/lrdatasourcemanagerintf.h \
$$PWD/lrreportengine.h \
@@ -87,6 +86,19 @@ contains(CONFIG,zint){
}
}
#### Install mkspecs, headers and libs to QT_INSTALL_DIR
headerFiles.path = $$[QT_INSTALL_HEADERS]/LimeReport/
headerFiles.files = $${DEST_INCLUDE_DIR}/*
INSTALLS += headerFiles
mkspecs.path = $$[QT_INSTALL_DATA]/mkspecs/features
mkspecs.files = limereport.prf
INSTALLS += mkspecs
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target
####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){