supporting the new Q_ENUM() with Q_ENUMS() backwards compatibility.

limereport/items/lrbarcodeitem.h

@@ -30,6 +30,7 @@
 #ifndef LRBARCODEITEM_H
 #define LRBARCODEITEM_H
 #include "lritemdesignintf.h"
+#include <QtGlobal>
 
 namespace LimeReport{
 
@@ -141,9 +142,9 @@ public:
         UPNQR           =143
 
     };
-    Q_ENUM(BarcodeType)
+
     enum AngleType{Angle0,Angle90,Angle180,Angle270};
-    Q_ENUM(AngleType)
+
     enum InputMode{
         DATA_INPUT_MODE     = 0,
         UNICODE_INPUT_MODE  = 1,
@@ -151,7 +152,15 @@ public:
         KANJI_INPUT_MODE    = 3,
         SJIS_INPUT_MODE     = 4
     };
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
+    Q_ENUM(BarcodeType)
+    Q_ENUM(AngleType)
     Q_ENUM(InputMode)
+#else
+    Q_ENUMS(BarcodeType)
+    Q_ENUMS(AngleType)
+    Q_ENUMS(InputMode)
+#endif
     BarcodeItem(QObject *owner, QGraphicsItem *parent);
     ~BarcodeItem();
     virtual BaseDesignIntf* createSameTypeItem(QObject *owner, QGraphicsItem *parent);

limereport/items/lrchartitem.h

@@ -2,6 +2,7 @@
 #define LRCHARTITEM_H
 #include "lritemdesignintf.h"
 #include "lrglobal.h"
+#include <QtGlobal>
 
 namespace LimeReport{
 
@@ -32,7 +33,11 @@ class SeriesItem : public QObject{
     Q_PROPERTY(SeriesItemPreferredType preferredType READ preferredType WRITE setPreferredType)
 public:
     enum SeriesItemPreferredType {Bar, Line};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
     Q_ENUM(SeriesItemPreferredType)
+#else
+    Q_ENUM(SeriesItemPreferredType)
+#endif
     SeriesItem(QObject* parent = 0) : QObject(parent), m_preferredType(Bar){}
     QString name() const;
     void setName(const QString &name);
@@ -126,11 +131,17 @@ class ChartItem : public LimeReport::ItemDesignIntf
 public:
 
     enum LegendAlign{LegendAlignTop,LegendAlignCenter,LegendAlignBottom};
-    Q_ENUM(LegendAlign)
     enum TitleAlign{TitleAlignLeft, TitleAlignCenter, TitleAlignRight};
-    Q_ENUM(TitleAlign)
     enum ChartType{Pie, VerticalBar, HorizontalBar, Lines};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
+    Q_ENUM(LegendAlign)
+    Q_ENUM(TitleAlign)
     Q_ENUM(ChartType)
+#else
+    Q_ENUMS(LegendAlign)
+    Q_ENUMS(TitleAlign)
+    Q_ENUMS(ChartType)
+#endif
 
     ChartItem(QObject* owner, QGraphicsItem* parent);
     ~ChartItem();

limereport/items/lrimageitem.h

@@ -30,6 +30,7 @@
 #ifndef LRIMAGEITEM_H
 #define LRIMAGEITEM_H
 #include "lritemdesignintf.h"
+#include <QtGlobal>
 
 namespace LimeReport{
 
@@ -56,7 +57,11 @@ public:
         Hex     = 1,
         Base64  = 2
     };
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
     Q_ENUM(Format)
+#else
+    Q_ENUMS(Format)
+#endif
 
     ImageItem(QObject *owner, QGraphicsItem *parent);
     virtual void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget);

limereport/items/lrshapeitem.h

@@ -30,6 +30,7 @@
 #ifndef LRSHAPEITEM_H
 #define LRSHAPEITEM_H
 #include "lritemdesignintf.h"
+#include <QtGlobal>
 
 namespace LimeReport{
 
@@ -46,7 +47,11 @@ class ShapeItem: public LimeReport::ItemDesignIntf
     Q_PROPERTY(int cornerRadius READ cornerRadius WRITE setCornerRadius)
 public:
     enum ShapeType{HorizontalLine,VerticalLine,Ellipse,Rectangle};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
     Q_ENUM(ShapeType)
+#else
+    Q_ENUMS(ShapeType)
+#endif
     ShapeItem(QObject *owner, QGraphicsItem *parent);
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void    setShapeColor(QColor value);

limereport/items/lrtextitem.h

@@ -33,6 +33,7 @@
 #include <QtGui>
 #include <QLabel>
 #include <QTextDocument>
+#include <QtGlobal>
 
 #include "lritemdesignintf.h"
 #include "lritemdesignintf.h"
@@ -76,11 +77,17 @@ class TextItem : public ContentItemDesignIntf, IPageInit {
 public:
 
     enum AutoWidth{NoneAutoWidth, MaxWordLength, MaxStringLength};
-    Q_ENUM(AutoWidth)
     enum AngleType{Angle0, Angle90, Angle180, Angle270, Angle45, Angle315};
-    Q_ENUM(AngleType)
     enum ValueType{Default, DateTime, Double};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
+    Q_ENUM(AutoWidth)
+    Q_ENUM(AngleType)
     Q_ENUM(ValueType)
+#else
+    Q_ENUMS(AutoWidth)
+    Q_ENUMS(AngleType)
+    Q_ENUMS(ValueType)
+#endif
 
     void Init();
     TextItem(QObject* owner=0, QGraphicsItem* parent=0);

limereport/lrbanddesignintf.h

@@ -138,7 +138,11 @@ public:
     enum BandColumnsLayoutType{
         Horizontal, Vertical, VerticalUniform
     };
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
     Q_ENUM(BandColumnsLayoutType)
+#else
+    Q_ENUMS(BandColumnsLayoutType)
+#endif
 
     BandDesignIntf(BandsType bandType, const QString& xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0);
     ~BandDesignIntf();

limereport/lrbasedesignintf.h

@@ -98,7 +98,7 @@ class  BaseDesignIntf :
     friend class ReportRender;
 public:
     enum BGMode { TransparentMode, OpaqueMode};
-    Q_ENUM(BGMode)
+
 
     enum BrushStyle{ NoBrush,
                      SolidPattern,
@@ -114,7 +114,7 @@ public:
                      CrossPattern,
                      BDiagPattern,
                      FDiagPattern };
-    Q_ENUM(BrushStyle)
+
 
     enum ResizeFlags { Fixed = 0,
                        ResizeLeft = 1,
@@ -123,13 +123,13 @@ public:
                        ResizeBottom = 8,
                        AllDirections = 15
                      };
-    Q_ENUM(ResizeFlags)
+
     enum MoveFlags  { None = 0,
                       LeftRight=1,
                       TopBotom=2,
                       All=3
                     };
-    Q_ENUM(MoveFlags)
+
     enum BorderSide {
                         NoLine = 0,
                         TopLine = 1,
@@ -138,13 +138,31 @@ public:
                         RightLine = 8,
                         AllLines = 15
                     };
-    Q_ENUM(BorderSide)
+
     enum ObjectState {ObjectLoading, ObjectLoaded, ObjectCreated};
-    Q_ENUM(ObjectState)
+
     enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign};
-    Q_ENUM(ItemAlign)
+
     enum UnitType {Millimeters, Inches};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
+    Q_ENUM(BGMode)
+    Q_ENUM(BrushStyle)
+    Q_ENUM(ResizeFlags)
+    Q_ENUM(MoveFlags)
+    Q_ENUM(BorderSide)
+    Q_ENUM(ObjectState)
+    Q_ENUM(ItemAlign)
     Q_ENUM(UnitType)
+#else
+    Q_ENUMS(BGMode)
+    Q_ENUMS(BrushStyle)
+    Q_ENUMS(ResizeFlags)
+    Q_ENUMS(MoveFlags)
+    Q_ENUMS(BorderSide)
+    Q_ENUMS(ObjectState)
+    Q_ENUMS(ItemAlign)
+    Q_ENUMS(UnitType)
+#endif
 //    enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols};
     Q_DECLARE_FLAGS(BorderLines, BorderSide)
     Q_DECLARE_FLAGS(ItemMode,ItemModes)

limereport/lrglobal.h

@@ -33,6 +33,7 @@
 #include <stdexcept>
 #include <QString>
 #include <QStyleOptionViewItem>
+#include <QtGlobal>
 
 #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

limereport/lritemdesignintf.h

@@ -43,7 +43,11 @@ class ItemDesignIntf : public BaseDesignIntf
     Q_PROPERTY(ItemAlign itemAlign READ itemAlign WRITE setItemAlign)
 public:
     enum LocationType{Band,Page};
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
     Q_ENUM(LocationType)
+#else
+    Q_ENUMS(LocationType)
+#endif
     ItemDesignIntf(const QString& xmlTypeName, QObject* owner = 0,QGraphicsItem* parent = 0);
     LocationType itemLocation(){return m_itemLocation;}
     void setItemLocation(LocationType location);

limereport/lrpageitemdesignintf.h

@@ -64,9 +64,9 @@ class PageItemDesignIntf : public ItemsContainerDesignInft
     friend class ReportRender;
 public:
     enum Orientation { Portrait = QPrinter::Portrait, Landscape = QPrinter::Landscape };
-    Q_ENUM(Orientation)
+
     enum PrintBehavior {Scale, Split};
-    Q_ENUM(PrintBehavior)
+
     enum PageSize {
         A4 = QPrinter::A4, B5 = QPrinter::B5, Letter = QPrinter::Letter,
         Legal = QPrinter::Legal, Executive = QPrinter::Executive,
@@ -79,7 +79,15 @@ public:
         Ledger = QPrinter::Ledger, Tabloid = QPrinter::Tabloid, Custom = QPrinter::Custom,
         NPageSize = Custom
     };
+#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
+    Q_ENUM(Orientation)
+    Q_ENUM(PrintBehavior)
     Q_ENUM(PageSize)
+#else
+    Q_ENUMS(Orientation)
+    Q_ENUMS(PrintBehavior)
+    Q_ENUMS(PageSize)
+#endif
     typedef QList<BandDesignIntf*> BandsList;
     typedef QList<BandDesignIntf*>::const_iterator BandsIterator;
     typedef QSharedPointer<PageItemDesignIntf> Ptr;