From 3999dc00bd6ba58046902c46487e73ebda4a61e9 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 30 Jul 2019 14:09:09 +0300 Subject: [PATCH] Static build has been fixed --- 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro | 3 ++- 3rdparty/zint-2.6.1/backend_qt/qzint_global.h | 4 ++++ common.pri | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro index 63eadfd..2af6b7d 100644 --- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro +++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro @@ -66,7 +66,8 @@ HEADERS += $$PWD/../backend/aztec.h \ $$PWD/../backend/sjis.h \ $$PWD/../backend/stdint_msvc.h \ $$PWD/../backend/zint.h \ - $$PWD/qzint.h + $$PWD/qzint.h \ + $$PWD/qzint_global.h SOURCES += $$PWD/../backend/2of5.c \ $$PWD/../backend/auspost.c \ diff --git a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h index 025b16e..ea46fe2 100644 --- a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h +++ b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h @@ -3,10 +3,14 @@ #include +#ifdef HAVE_STATIC_BUILD +# define QZINTSHARED_EXPORT /**/ +#else #if defined(QZINT_LIBRARY) # define QZINTSHARED_EXPORT Q_DECL_EXPORT #else # define QZINTSHARED_EXPORT Q_DECL_IMPORT #endif +#endif #endif // QZINT_GLOBAL_H diff --git a/common.pri b/common.pri index 367a666..3dcb931 100644 --- a/common.pri +++ b/common.pri @@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 5 -LIMEREPORT_VERSION_RELEASE = 4 +LIMEREPORT_VERSION_RELEASE = 5 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"