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 [](https://ci.appveyor.com/project/fralx/limereport/branch/master) [](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard)  +# LimeReport v1.7.5 [](https://ci.appveyor.com/project/fralx/limereport/branch/master) [](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard)  ## 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}\\\" 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;