Merge branch 'master' into feature/speed_up

# Conflicts:
#	limereport/lrbanddesignintf.cpp
#	limereport/lrreportengine.cpp
This commit is contained in:
Arin Alexander
2019-10-12 22:37:32 +03:00
29 changed files with 1146 additions and 171 deletions

View File

@@ -304,7 +304,7 @@ void ReportEnginePrivate::internalPrintPages(ReportPages pages, QPrinter &printe
{
m_cancelPrinting = false;
int currenPage = 1;
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors;
QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer)));
emit printingStarted(printer.toPage() - printer.fromPage());
foreach(PageItemDesignIntf::Ptr page, pages){