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:
#	limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
This commit is contained in:
Arin Alexander
2019-05-12 23:15:07 +03:00
parent 22c020569d b768285cd9
commit 3f0558f2e9
5 changed files with 3370 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/limereport.pro
View File

@@ -111,7 +111,7 @@ INSTALLS += target
####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){
LANGUAGES = ru es_ES ar fr zh
LANGUAGES = ru es_ES ar fr zh pl
defineReplace(prependAll) {
for(a,$$1):result += $$2$${a}$$3