mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Merge tag '1.5.47' into develop

Browse Source 
Finish 1.5.47
This commit is contained in:
Arin Alexander 2020-04-06 22:00:30 +03:00
commit 6ae4e7b8cb
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -134,7 +134,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 46
LIMEREPORT_VERSION_RELEASE = 47
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

2
include/lrglobal.h
View File

@ -51,8 +51,6 @@ namespace LimeReport {
#define VARIABLE_IS_NOT_USED
#endif
Q_NAMESPACE
namespace Const{
int const DEFAULT_GRID_STEP = 1;
int const RESIZE_HANDLE_SIZE = 5;

5
limereport/lrglobal.h
View File

@ -51,7 +51,9 @@ namespace LimeReport {
#define VARIABLE_IS_NOT_USED
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_NAMESPACE
#endif
namespace Const{
int const DEFAULT_GRID_STEP = 1;
@ -152,9 +154,6 @@ namespace Const{
typedef QStyleOptionViewItem StyleOptionViewItem;
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_NAMESPACE
#endif
class Enums
{
public: