mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

Merge tag '1.5.39' into develop

Browse Source 
Finish 1.5.39
This commit is contained in:
Arin Alexander 2020-02-27 19:34:59 +03:00
commit 06d6bd2e1b
2 changed files with 4 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_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 38
LIMEREPORT_VERSION_RELEASE = 39
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

4
limereport/lrdatadesignintf.cpp
View File

@ -190,8 +190,10 @@ ModelToDataSource::ModelToDataSource(QAbstractItemModel* model, bool owned)
{
Q_ASSERT(model);
if (model){
while (model->canFetchMore(QModelIndex()))
while (model->canFetchMore(QModelIndex())){
model->fetchMore(QModelIndex());
if (model->rowCount() <= 0) break;
}
connect(model, SIGNAL(destroyed()), this, SLOT(slotModelDestroed()));
connect(model, SIGNAL(modelReset()), this, SIGNAL(modelStateChanged()));
}