From 57df5eba3af1bd7f674942318d0a732ed9be9864 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 29 Aug 2023 17:31:07 +0000 Subject: [PATCH 1/2] chore: update version info Update version info in cmake, qmake and REAMDE.md --- CMakeLists.txt | 4 ++-- README.md | 2 +- common.pri | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbab265..ea9a674 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.14) project(limereport) set(LIMEREPORT_VERSION_MAJOR 1) -set(LIMEREPORT_VERSION_MINOR 6) -set(LIMEREPORT_VERSION_RELEASE 8) +set(LIMEREPORT_VERSION_MINOR 7) +set(LIMEREPORT_VERSION_RELEASE 5) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) diff --git a/README.md b/README.md index 0bafa82..f35b8aa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# LimeReport v1.5.87 [![Build status](https://ci.appveyor.com/api/projects/status/wna5429pix7ilcmo/branch/master?svg=true)](https://ci.appveyor.com/project/fralx/limereport/branch/master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard) ![Cmake Build Status](https://github.com/fralx/limereport/actions/workflows/cmake.yml/badge.svg) +# LimeReport v1.7.5 [![Build status](https://ci.appveyor.com/api/projects/status/wna5429pix7ilcmo/branch/master?svg=true)](https://ci.appveyor.com/project/fralx/limereport/branch/master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard) ![Cmake Build Status](https://github.com/fralx/limereport/actions/workflows/cmake.yml/badge.svg) ## Official LimeReport web site [http://limereport.ru](http://limereport.ru) diff --git a/common.pri b/common.pri index 160fdce..c2359ee 100644 --- a/common.pri +++ b/common.pri @@ -140,8 +140,8 @@ OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 -LIMEREPORT_VERSION_MINOR = 6 -LIMEREPORT_VERSION_RELEASE = 8 +LIMEREPORT_VERSION_MINOR = 7 +LIMEREPORT_VERSION_RELEASE = 5 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" From 98e181b158aa3d2e6b4a7d46a8c2cf85bc78091c Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Sun, 14 Jan 2024 21:08:34 +0300 Subject: [PATCH 2/2] addCSV has been added to IDataSourceManager --- include/lrdatasourcemanagerintf.h | 1 + limereport/lrdatasourcemanagerintf.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/lrdatasourcemanagerintf.h b/include/lrdatasourcemanagerintf.h index c43b239..0ff4a55 100644 --- a/include/lrdatasourcemanagerintf.h +++ b/include/lrdatasourcemanagerintf.h @@ -55,6 +55,7 @@ public: virtual bool containsVariable(const QString& variableName) = 0; virtual QVariant variable(const QString& variableName) = 0; virtual bool addModel(const QString& name, QAbstractItemModel *model, bool owned) = 0; + virtual void addCSV(const QString& name, const QString& csvText, const QString& separator, bool firstRowIsHeader) = 0; virtual void removeModel(const QString& name) = 0; virtual bool containsDatasource(const QString& dataSourceName) = 0; virtual void clearUserVariables()=0; diff --git a/limereport/lrdatasourcemanagerintf.h b/limereport/lrdatasourcemanagerintf.h index c43b239..0ff4a55 100644 --- a/limereport/lrdatasourcemanagerintf.h +++ b/limereport/lrdatasourcemanagerintf.h @@ -55,6 +55,7 @@ public: virtual bool containsVariable(const QString& variableName) = 0; virtual QVariant variable(const QString& variableName) = 0; virtual bool addModel(const QString& name, QAbstractItemModel *model, bool owned) = 0; + virtual void addCSV(const QString& name, const QString& csvText, const QString& separator, bool firstRowIsHeader) = 0; virtual void removeModel(const QString& name) = 0; virtual bool containsDatasource(const QString& dataSourceName) = 0; virtual void clearUserVariables()=0;