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

Merge tag '1.5.56' into develop

Browse Source 
Finish 1.5.56
This commit is contained in:
fralx 2020-05-25 13:22:11 +03:00
commit e3356a3d00
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -134,7 +134,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 = 55 LIMEREPORT_VERSION_RELEASE = 56
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}\\\"

23
limereport/lrscriptenginemanager.cpp
View File

@ -1987,16 +1987,19 @@ void TableBuilder::fillInRowData(QObject* row)
void TableBuilder::buildTable(const QString& datasourceName) void TableBuilder::buildTable(const QString& datasourceName)
{ {
checkBaseLayout(); checkBaseLayout();
m_dataManager->dataSourceHolder(datasourceName)->invalidate(IDataSource::RENDER_MODE); IDataSourceHolder* dh = m_dataManager->dataSourceHolder(datasourceName);
IDataSource* ds = m_dataManager->dataSource(datasourceName); if (dh) {
if (ds){ dh->invalidate(IDataSource::RENDER_MODE);
bool firstTime = true; IDataSource* ds = m_dataManager->dataSource(datasourceName);
QObject* row = m_horizontalLayout; if (ds){
while(!ds->eof()){ bool firstTime = true;
if (!firstTime) row = addRow(); QObject* row = m_horizontalLayout;
else firstTime = false; while(!ds->eof()){
fillInRowData(row); if (!firstTime) row = addRow();
ds->next(); else firstTime = false;
fillInRowData(row);
ds->next();
}
} }
} }
} }