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

Merge tag '1.5.31' into develop

Browse Source 
Finish 1.5.31
This commit is contained in:
Alexander Arin 2020-02-01 20:11:13 +03:00
commit 93852c5a89
2 changed files with 4 additions and 5 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 = 29 LIMEREPORT_VERSION_RELEASE = 31
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}\\\"

7
limereport/lrreportengine.cpp
View File

@ -316,18 +316,17 @@ void ReportEnginePrivate::internalPrintPages(ReportPages pages, QPrinter &printe
if ( !m_cancelPrinting && if ( !m_cancelPrinting &&
((printer.printRange() == QPrinter::AllPages) || ((printer.printRange() == QPrinter::AllPages) ||
( (printer.printRange()==QPrinter::PageRange) && ( (printer.printRange()==QPrinter::PageRange) &&
(currenPage>=printer.fromPage()) && (currenPage >= printer.fromPage()) &&
(currenPage<=printer.toPage()) (currenPage <= printer.toPage())
)) ))
) )
{ {
printProcessors["default"]->printPage(page); printProcessors["default"]->printPage(page);
currenPage++;
emit pagePrintingFinished(currenPage); emit pagePrintingFinished(currenPage);
QApplication::processEvents(); QApplication::processEvents();
} }
currenPage++;
} }
emit printingFinished(); emit printingFinished();
} }