mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-02 11:54:59 +03:00
Code Activity

Merge tag '1.5.40' into develop

Browse Source 
Finish 1.5.40
This commit is contained in:
Arin Alexander
2020-03-04 16:26:52 +03:00
parent 06d6bd2e1b c8947893b3
commit da9e27929f
16 changed files with 126 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/lrglobal.h
View File

@@ -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