mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Build fixed
This commit is contained in:
parent
e83f739bfd
commit
72824cfa6c
@ -133,7 +133,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 5
|
LIMEREPORT_VERSION_MINOR = 5
|
||||||
LIMEREPORT_VERSION_RELEASE = 46
|
LIMEREPORT_VERSION_RELEASE = 47
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -51,8 +51,6 @@ namespace LimeReport {
|
|||||||
#define VARIABLE_IS_NOT_USED
|
#define VARIABLE_IS_NOT_USED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Q_NAMESPACE
|
|
||||||
|
|
||||||
namespace Const{
|
namespace Const{
|
||||||
int const DEFAULT_GRID_STEP = 1;
|
int const DEFAULT_GRID_STEP = 1;
|
||||||
int const RESIZE_HANDLE_SIZE = 5;
|
int const RESIZE_HANDLE_SIZE = 5;
|
||||||
|
@ -51,7 +51,9 @@ namespace LimeReport {
|
|||||||
#define VARIABLE_IS_NOT_USED
|
#define VARIABLE_IS_NOT_USED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Const{
|
namespace Const{
|
||||||
int const DEFAULT_GRID_STEP = 1;
|
int const DEFAULT_GRID_STEP = 1;
|
||||||
@ -152,9 +154,6 @@ namespace Const{
|
|||||||
typedef QStyleOptionViewItem StyleOptionViewItem;
|
typedef QStyleOptionViewItem StyleOptionViewItem;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
|
|
||||||
Q_NAMESPACE
|
|
||||||
#endif
|
|
||||||
class Enums
|
class Enums
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Loading…
Reference in New Issue
Block a user