Merge tag '1.5.17' into develop

Finish 1.5.17
This commit is contained in:
Arin Alexander 2019-10-13 14:28:51 +03:00
commit 48285af8a0
2 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
# LimeReport v1.5.15 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard)
# LimeReport v1.5.16 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard)
## Official LimeReport web site [http://limereport.ru](http://limereport.ru)

View File

@ -198,7 +198,7 @@ private:
QMultiMap< BandDesignIntf*, GroupBandsHolder* > m_childBands;
QList<BandDesignIntf*> m_reprintableBands;
QList<BandDesignIntf*> m_recalcBands;
QMap<QString, QVector<QString>> m_groupfunctionItems;
QMap<QString, QVector<QString> > m_groupfunctionItems;
int m_currentIndex;
int m_pageCount;