diff --git a/common.pri b/common.pri index 65d5fed..b7a1f16 100644 --- a/common.pri +++ b/common.pri @@ -77,7 +77,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}\" diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp index 1233ac0..c180bfc 100644 --- a/limereport/items/lrimageitem.cpp +++ b/limereport/items/lrimageitem.cpp @@ -67,7 +67,6 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, m_picture = data.value(); } else { switch (m_format) { - default: case Binary: m_picture.loadFromData(data.toByteArray()); break; @@ -76,13 +75,16 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, break; case Base64: m_picture.loadFromData(QByteArray::fromBase64(data.toByteArray())); - break; + break; } + } } } } 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); } }