From 915b335fb54959e139cc18dc94d5305a4fa71c58 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 2 Mar 2017 19:47:42 +0300 Subject: [PATCH 1/2] Qt 4.8 build fixed --- common.pri | 2 +- limereport/lrbasedesignintf.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 121fc2f..3f8f6b5 100644 --- a/common.pri +++ b/common.pri @@ -56,7 +56,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 1 +LIMEREPORT_VERSION_RELEASE = 2 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 4f615ed..7b4d78d 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -76,6 +76,7 @@ protected: }; class DataSourceManager; +class ReportRender; class BaseDesignIntf : public QObject, public QGraphicsItem, public ICollectionContainer, public ObjectLoadingStateIntf { @@ -94,7 +95,7 @@ class BaseDesignIntf : Q_PROPERTY(int borderLineSize READ borderLineSize WRITE setBorderLineSize) Q_PROPERTY(bool isVisible READ isVisible WRITE setItemVisible DESIGNABLE false) Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) - + friend class ReportRender; public: enum BGMode { TransparentMode, OpaqueMode}; From 84bb15802cbca9b08895fd8c25f2aa9799ba3ac5 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 2 Mar 2017 20:22:49 +0300 Subject: [PATCH 2/2] msvc build fixed --- limereport/lrbasedesignintf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 7b4d78d..c925579 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -34,6 +34,7 @@ #include #include #include +#include #include "lrcollection.h" #include "lrglobal.h" #include "serializators/lrstorageintf.h"