mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Finish 1.4.75

Browse Source
This commit is contained in:
Arin Alex 2018-03-28 19:24:17 +03:00
commit 483bf57e5d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,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 = 74 LIMEREPORT_VERSION_RELEASE = 75
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}\"

4
limereport/items/lrtextitem.cpp
View File

@ -545,7 +545,9 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec
void TextItem::setWatermark(bool watermark) void TextItem::setWatermark(bool watermark)
{ {
setBackgroundMode(TransparentMode); if (watermark){
setBackgroundMode(TransparentMode);
}
BaseDesignIntf::setWatermark(watermark); BaseDesignIntf::setWatermark(watermark);
} }