Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Arin Alex
2017-07-14 18:36:44 +03:00
2 changed files with 4 additions and 1 deletions

View File

@@ -624,6 +624,9 @@ void ReportRender::renderPageItems(PageItemDesignIntf* patternPage)
}
m_renderPageItem->restoreLinks();
m_renderPageItem->updateSubItemsSize(FirstPass,m_datasources);
foreach(BaseDesignIntf* item, pageItems){
item->setZValue(item->zValue()-100000);
}
}
qreal ReportRender::calcPageFooterHeight(PageItemDesignIntf *patternPage)