0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00

Merge branch 'master' into 1.4

# Conflicts:
#	limereport/limereport.pri
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2016-10-04 04:47:05 +04:00
17 changed files with 226 additions and 24 deletions

View File

@@ -177,7 +177,7 @@ QSettings*PreviewReportWindow::settings()
}
}
void PreviewReportWindow::setReportReader(ItemsReaderIntf::Ptr reader)
void PreviewReportWindow::setReportReader(ItemsReaderIntf::Ptr /*reader*/)
{
// m_reader=reader;
// if (!reader.isNull()){