diff --git a/CMakeLists.txt b/CMakeLists.txt index ea9a674..77d1a6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(limereport) set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MINOR 7) -set(LIMEREPORT_VERSION_RELEASE 5) +set(LIMEREPORT_VERSION_RELEASE 7) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) @@ -393,7 +393,6 @@ endif(ENABLE_ZINT) target_compile_definitions( ${PROJECT_NAME} PRIVATE -DHAVE_QT${QT_VERSION_MAJOR} -DHAVE_REPORT_DESIGNER -DUSE_QJSENGINE -D_CRT_SECURE_NO_WARNINGS) - target_include_directories( ${PROJECT_NAME} PRIVATE limereport/ limereport/base diff --git a/common.pri b/common.pri index c2359ee..f476b66 100644 --- a/common.pri +++ b/common.pri @@ -141,7 +141,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 7 -LIMEREPORT_VERSION_RELEASE = 5 +LIMEREPORT_VERSION_RELEASE = 7 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/base/lrattribsabstractfactory.h b/limereport/base/lrattribsabstractfactory.h index 4fc7a0f..a6b76dc 100644 --- a/limereport/base/lrattribsabstractfactory.h +++ b/limereport/base/lrattribsabstractfactory.h @@ -54,6 +54,7 @@ private: friend class Singleton< AttribsAbstractFactory< AbstractProduct,IdentifierType,ProductCreator,Attribs > >; public: bool registerCreator(const IdentifierType& id, Attribs attribs, ProductCreator creator){ + if (m_factoryMap.contains(id)) return true; return (m_factoryMap.insert(id,creator).value() == creator) && (m_attribsMap.insert(id,attribs).value() == attribs); }