mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Finish 1.5.13
This commit is contained in:
commit
e9413b94c3
@ -127,7 +127,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 = 12
|
LIMEREPORT_VERSION_RELEASE = 13
|
||||||
|
|
||||||
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}\\\"
|
||||||
|
@ -278,6 +278,7 @@ void PageDesignIntf::setPageItem(PageItemDesignIntf::Ptr pageItem)
|
|||||||
|
|
||||||
void PageDesignIntf::setPageItems(QList<PageItemDesignIntf::Ptr> pages)
|
void PageDesignIntf::setPageItems(QList<PageItemDesignIntf::Ptr> pages)
|
||||||
{
|
{
|
||||||
|
m_currentPage = 0;
|
||||||
if (!m_pageItem.isNull()) {
|
if (!m_pageItem.isNull()) {
|
||||||
removeItem(m_pageItem.data());
|
removeItem(m_pageItem.data());
|
||||||
m_pageItem.clear();
|
m_pageItem.clear();
|
||||||
|
Loading…
Reference in New Issue
Block a user