mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 01:24:39 +03:00
Code

Merge tag '1.5.37' into develop

Browse Source 
Finish 1.5.37
This commit is contained in:
Arin Alexander 2020-02-18 02:03:13 +03:00
commit f0bca747a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -128,7 +128,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 36 LIMEREPORT_VERSION_RELEASE = 37
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

2
limereport/lrreportrender.cpp
View File

@ -1264,7 +1264,7 @@ BandDesignIntf *ReportRender::renderData(BandDesignIntf *patternBand)
replaceGroupsFunction(bandClone); replaceGroupsFunction(bandClone);
} }
patternBand->preparedForRender(); emit(patternBand->preparedForRender());
bandClone->updateItemSize(m_datasources); bandClone->updateItemSize(m_datasources);
//m_scriptEngineContext->baseDesignIntfToScript(bandClone); //m_scriptEngineContext->baseDesignIntfToScript(bandClone);