mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 16:44:39 +03:00
Redundant code has been removed
This commit is contained in:
parent
efe6fd2cb2
commit
e12dcd4df9
@ -133,7 +133,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 = 43
|
LIMEREPORT_VERSION_RELEASE = 44
|
||||||
|
|
||||||
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}\\\"
|
||||||
|
@ -155,16 +155,7 @@ void ImageItem::setImageAsByteArray(QByteArray image)
|
|||||||
{
|
{
|
||||||
QImage value;
|
QImage value;
|
||||||
value.loadFromData(image);
|
value.loadFromData(image);
|
||||||
if (m_picture != value){
|
setImage(value);
|
||||||
QImage oldValue = m_picture;
|
|
||||||
m_picture = value;
|
|
||||||
if (m_autoSize){
|
|
||||||
setWidth(m_picture.width());
|
|
||||||
setHeight(m_picture.height());
|
|
||||||
}
|
|
||||||
update();
|
|
||||||
notify("image",oldValue,value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ImageItem::fileFilter() const
|
QString ImageItem::fileFilter() const
|
||||||
|
Loading…
Reference in New Issue
Block a user