From 72824cfa6cc0b8698c9f0f494ab3ec61c532759a Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 6 Apr 2020 22:00:20 +0300 Subject: [PATCH] Build fixed --- common.pri | 2 +- include/lrglobal.h | 2 -- limereport/lrglobal.h | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common.pri b/common.pri index 339bd2e..3f6738b 100644 --- a/common.pri +++ b/common.pri @@ -133,7 +133,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}\\\" diff --git a/include/lrglobal.h b/include/lrglobal.h index 91649ec..1c8075f 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -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; diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index 91649ec..8a312d8 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -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: