mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

Finish 1.4.128

Browse Source 
# Conflicts:
#	limereport/items/lrimageitem.cpp
This commit is contained in:
Arin Alexander
2019-04-29 11:03:56 +03:00
parent 271b765722 a1af26eab3
commit 13e3c3976c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/items/lrimageitem.cpp
View File

@@ -120,6 +120,8 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
loadPictureFromVariant(data);
}
} 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);
} else if (!m_variable.isEmpty()){
QVariant data = dataManager->variable(m_variable);