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

Finish 1.4.128

Browse Source
This commit is contained in:
Arin Alexander 2019-04-29 10:45:15 +03:00
commit 59bcfcb5b2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -77,7 +77,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 = 124 LIMEREPORT_VERSION_RELEASE = 128
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/lrimageitem.cpp
View File

@ -67,7 +67,6 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
m_picture = data.value<QImage>(); m_picture = data.value<QImage>();
} else { } else {
switch (m_format) { switch (m_format) {
default:
case Binary: case Binary:
m_picture.loadFromData(data.toByteArray()); m_picture.loadFromData(data.toByteArray());
break; break;
@ -78,11 +77,14 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
m_picture.loadFromData(QByteArray::fromBase64(data.toByteArray())); m_picture.loadFromData(QByteArray::fromBase64(data.toByteArray()));
break; break;
} }
} }
} }
} }
} else if (!m_resourcePath.isEmpty()){ } else if (!m_resourcePath.isEmpty()){
m_resourcePath = expandUserVariables(m_resourcePath, pass, NoEscapeSymbols, dataManager);
m_resourcePath = expandDataFields(m_resourcePath, NoEscapeSymbols, dataManager);
m_picture = QImage(m_resourcePath); m_picture = QImage(m_resourcePath);
} }
} }