Finish version/1.7.0

This commit is contained in:
Arin Alex 2023-02-07 00:33:27 +03:00
commit 8ed3fb6344
2 changed files with 4 additions and 2 deletions

View File

@ -60,7 +60,6 @@ void BandMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem* /**opt
boundingRect().bottomLeft().y()-4, boundingRect().bottomLeft().y()-4,
boundingRect().width(),4), Qt::lightGray boundingRect().width(),4), Qt::lightGray
); );
qDebug()<<boundingRect().width();
painter->setRenderHint(QPainter::Antialiasing); painter->setRenderHint(QPainter::Antialiasing);
qreal size = (boundingRect().width()<boundingRect().height()) ? boundingRect().width() : boundingRect().height(); qreal size = (boundingRect().width()<boundingRect().height()) ? boundingRect().width() : boundingRect().height();
QRectF r = QRectF(0,0,size,size); QRectF r = QRectF(0,0,size,size);

View File

@ -44,8 +44,11 @@ public:
Q_DECLARE_METATYPE(ACollectionProperty) Q_DECLARE_METATYPE(ACollectionProperty)
namespace LimeReport{ namespace LimeReport{
#if __cplusplus >= 201703L
const int inline COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>(); const int inline COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>();
#else
const int inline COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>();
#endif
class LIMEREPORT_EXPORT ICollectionContainer{ class LIMEREPORT_EXPORT ICollectionContainer{
public: public:
virtual QObject* createElement(const QString& collectionName,const QString& elementType)=0; virtual QObject* createElement(const QString& collectionName,const QString& elementType)=0;