diff --git a/include/lrglobal.h b/include/lrglobal.h index c647294..298e0d8 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -33,6 +33,7 @@ #include #include #include +#include #if defined(LIMEREPORT_EXPORTS) # define LIMEREPORT_EXPORT Q_DECL_EXPORT @@ -157,7 +158,11 @@ namespace Const{ { public: enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime}; +#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) Q_ENUM(VariableDataType) +#else + Q_ENUMS(VariableDataType) +#endif private: Enums(){} Q_GADGET diff --git a/limereport/items/lrabstractlayout.h b/limereport/items/lrabstractlayout.h index e4c5010..14ec715 100644 --- a/limereport/items/lrabstractlayout.h +++ b/limereport/items/lrabstractlayout.h @@ -3,6 +3,7 @@ #include "lritemdesignintf.h" #include "lrlayoutmarker.h" +#include namespace LimeReport{ class AbstractLayout: public LayoutDesignIntf @@ -12,7 +13,11 @@ class AbstractLayout: public LayoutDesignIntf Q_PROPERTY(int layoutSpacing READ layoutSpacing WRITE setLayoutSpacing) public: enum LayoutType{Layout,Table}; +#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) Q_ENUM(LayoutType) +#else + Q_ENUMS(LayoutType) +#endif AbstractLayout(QString xmlTag, QObject *owner = 0, QGraphicsItem *parent = 0); ~AbstractLayout(); QList& layoutsChildren(); diff --git a/limereport/items/lrchartitem.h b/limereport/items/lrchartitem.h index b2cd881..2197b8d 100644 --- a/limereport/items/lrchartitem.h +++ b/limereport/items/lrchartitem.h @@ -36,7 +36,7 @@ public: #if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) Q_ENUM(SeriesItemPreferredType) #else - Q_ENUM(SeriesItemPreferredType) + Q_ENUMS(SeriesItemPreferredType) #endif SeriesItem(QObject* parent = 0) : QObject(parent), m_preferredType(Bar){} QString name() const;