mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 08:34:38 +03:00
Merge branch 'develop' into feature/Ruler
This commit is contained in:
commit
1991515fc5
@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 4
|
LIMEREPORT_VERSION_MINOR = 4
|
||||||
LIMEREPORT_VERSION_RELEASE = 134
|
LIMEREPORT_VERSION_RELEASE = 136
|
||||||
|
|
||||||
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}\\\"
|
||||||
|
@ -492,7 +492,6 @@ void PreviewReportWindow::slotScalePercentChanged(int percent)
|
|||||||
void PreviewReportWindow::on_actionShowMessages_toggled(bool value)
|
void PreviewReportWindow::on_actionShowMessages_toggled(bool value)
|
||||||
{
|
{
|
||||||
m_previewReportWidget->setErrorsMesagesVisible(value);
|
m_previewReportWidget->setErrorsMesagesVisible(value);
|
||||||
m_previewReportWidget->startInsertTextItem();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PreviewReportWindow::on_actionShow_Toolbar_triggered()
|
void PreviewReportWindow::on_actionShow_Toolbar_triggered()
|
||||||
|
Loading…
Reference in New Issue
Block a user