Finish 1.4.128

# Conflicts:
#	limereport/items/lrimageitem.cpp
This commit is contained in:
Arin Alexander 2019-04-29 11:03:56 +03:00
commit 13e3c3976c
2 changed files with 3 additions and 1 deletions

View File

@ -120,7 +120,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 124
LIMEREPORT_VERSION_RELEASE = 128
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

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);