mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 08:34:38 +03:00
Finish 1.4.70
# Conflicts: # limereport/lrbasedesignintf.h
This commit is contained in:
commit
57ab5c6fb0
@ -96,7 +96,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 4
|
||||
LIMEREPORT_VERSION_RELEASE = 69
|
||||
LIMEREPORT_VERSION_RELEASE = 70
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -555,6 +555,12 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec
|
||||
}
|
||||
}
|
||||
|
||||
void TextItem::setWatermark(bool watermark)
|
||||
{
|
||||
setBackgroundMode(TransparentMode);
|
||||
BaseDesignIntf::setWatermark(watermark);
|
||||
}
|
||||
|
||||
|
||||
QString TextItem::followTo() const
|
||||
{
|
||||
|
@ -166,6 +166,8 @@ public:
|
||||
Qt::LayoutDirection textLayoutDirection() const;
|
||||
void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection);
|
||||
|
||||
void setWatermark(bool watermark);
|
||||
|
||||
protected:
|
||||
void updateLayout();
|
||||
bool isNeedExpandContent() const;
|
||||
|
@ -279,6 +279,8 @@ public:
|
||||
virtual QMap<QString, QString> getStringForTranslation();
|
||||
bool fillInSecondPass() const;
|
||||
void setFillInSecondPass(bool fillInSecondPass);
|
||||
bool isWatermark() const;
|
||||
virtual void setWatermark(bool watermark);
|
||||
|
||||
Q_INVOKABLE QString setItemWidth(qreal width);
|
||||
Q_INVOKABLE QString setItemHeight(qreal height);
|
||||
@ -289,9 +291,6 @@ public:
|
||||
Q_INVOKABLE QString setItemPosX(qreal xValue);
|
||||
Q_INVOKABLE QString setItemPosY(qreal yValue);
|
||||
|
||||
bool isWatermark() const;
|
||||
void setWatermark(bool watermark);
|
||||
|
||||
protected:
|
||||
|
||||
//ICollectionContainer
|
||||
|
Loading…
Reference in New Issue
Block a user