diff --git a/common.pri b/common.pri index 2c33314..35091ea 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 86 +LIMEREPORT_VERSION_RELEASE = 87 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/lrpreviewreportwidget.cpp b/limereport/lrpreviewreportwidget.cpp index 66dc5de..2776aeb 100644 --- a/limereport/lrpreviewreportwidget.cpp +++ b/limereport/lrpreviewreportwidget.cpp @@ -228,6 +228,7 @@ void PreviewReportWidget::setScalePercent(int percent) m_scaleType = OneToOne; } else { m_scaleType = Percents; + m_scalePercent = percent; } } diff --git a/limereport/serializators/lrxmlbasetypesserializators.cpp b/limereport/serializators/lrxmlbasetypesserializators.cpp index c0c2ce7..559bee9 100644 --- a/limereport/serializators/lrxmlbasetypesserializators.cpp +++ b/limereport/serializators/lrxmlbasetypesserializators.cpp @@ -179,9 +179,9 @@ void XmlFontSerializator::save(const QVariant &value, QString name) _node.setAttribute("Type","QFont"); _node.setAttribute("family",font.family()); _node.setAttribute("pointSize",font.pointSize()); -#if QT_VERSION>0x040800 - _node.setAttribute("stylename",font.styleName()); -#endif +//#if QT_VERSION>0x040800 +// _node.setAttribute("stylename",font.styleName()); +//#endif _node.setAttribute("weight",font.weight()); //saveBool(_node,"bold",font.bold()); saveBool(_node,"italic",font.italic()); @@ -194,9 +194,9 @@ QVariant XmlFontSerializator::loadValue() QFont font; font.setFamily(node()->attribute("family")); font.setPointSize(node()->attribute("pointSize").toInt()); -#if QT_VERSION>0x040800 - font.setStyleName(node()->attribute("stylename")); -#endif +//#if QT_VERSION>0x040800 +// font.setStyleName(node()->attribute("stylename")); +//#endif font.setWeight(node()->attribute("weight").toInt()); if (!node()->attribute("bold").isEmpty()) font.setBold(node()->attribute("bold").toInt());