0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00

Merge branch 'master' into 1.4

This commit is contained in:
Arin Alex
2016-07-07 23:52:51 +03:00
17 changed files with 56 additions and 26 deletions

View File

@@ -32,6 +32,7 @@
#include "qglobal.h"
#include <stdexcept>
#include <QString>
#include <QStyleOptionViewItem>
#if defined(LIMEREPORT_EXPORTS)
# define LIMEREPORT_EXPORT Q_DECL_EXPORT
@@ -94,6 +95,13 @@ namespace Const{
bool m_suppressAbsentFieldsAndVarsWarnings;
};
#ifdef HAVE_QT4
typedef QStyleOptionViewItemV4 StyleOptionViewItem;
#else
typedef QStyleOptionViewItem StyleOptionViewItem;
#endif
} // namespace LimeReport