mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Finish 1.5.1

Browse Source
This commit is contained in:
Arin Alexander 2019-07-04 20:42:12 +03:00
commit 8b24fa3558
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -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 = 0 LIMEREPORT_VERSION_RELEASE = 1
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}\\\"

15
limereport/items/editors/lrfonteditorwidget.cpp
View File

@ -140,19 +140,24 @@ void FontEditorWidget::slotPropertyChanged(const QString &objectName, const QStr
void FontEditorWidgetForPage::slotFontChanged(const QFont& font) void FontEditorWidgetForPage::slotFontChanged(const QFont& font)
{ {
m_page->setFont(font); if (!ignoreSlots())
m_page->setFont(font);
} }
void FontEditorWidgetForPage::slotFontSizeChanged(const QString& value) void FontEditorWidgetForPage::slotFontSizeChanged(const QString& value)
{ {
FontEditorWidget::slotFontSizeChanged(value); if (!ignoreSlots()){
m_page->setFont(resFont()); FontEditorWidget::slotFontSizeChanged(value);
m_page->setFont(resFont());
}
} }
void FontEditorWidgetForPage::slotFontAttribsChanged(bool value) void FontEditorWidgetForPage::slotFontAttribsChanged(bool value)
{ {
FontEditorWidget::slotFontAttribsChanged(value); if (!ignoreSlots()){
m_page->setFont(resFont()); FontEditorWidget::slotFontAttribsChanged(value);
m_page->setFont(resFont());
}
} }
#ifdef HAVE_REPORT_DESIGNER #ifdef HAVE_REPORT_DESIGNER