From 088a6eadce49da44c1ba9826391903cc37fcedbd Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 3 Feb 2021 22:00:14 +0300 Subject: [PATCH] qzint build has been fixed --- 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro | 2 +- 3rdparty/zint-2.6.1/backend_qt/qzint_global.h | 6 ++---- limereport.pri | 1 + limereport/limereport.pro | 1 + 4 files changed, 5 insertions(+), 5 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 2af6b7d..1efb6b2 100644 --- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro +++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro @@ -4,7 +4,7 @@ TEMPLATE = lib contains(CONFIG, static_build){ message(Static Build) CONFIG += staticlib - DEFINES += HAVE_STATIC_BUILD + DEFINES += QZINT_STATIC_BUILD } !contains(CONFIG, staticlib){ 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 ea46fe2..092cb47 100644 --- a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h +++ b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h @@ -3,14 +3,12 @@ #include -#ifdef HAVE_STATIC_BUILD +#ifdef QZINT_STATIC_BUILD # define QZINTSHARED_EXPORT /**/ -#else -#if defined(QZINT_LIBRARY) +#elif QZINT_LIBRARY # define QZINTSHARED_EXPORT Q_DECL_EXPORT #else # define QZINTSHARED_EXPORT Q_DECL_IMPORT #endif -#endif #endif // QZINT_GLOBAL_H diff --git a/limereport.pri b/limereport.pri index a7f272f..420c0f0 100644 --- a/limereport.pri +++ b/limereport.pri @@ -1,5 +1,6 @@ CONFIG += zint include(./limereport/limereport.pri) contains(CONFIG, zint){ + DEFINES+=QZINT_STATIC_BUILD include(./qzint.pri) } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 20bda83..c6f8c89 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -28,6 +28,7 @@ DEFINES += LIMEREPORT_EXPORTS contains(CONFIG, staticlib){ DEFINES += HAVE_STATIC_BUILD + DEFINES += QZINT_STATIC_BUILD message(STATIC_BUILD) DEFINES -= LIMEREPORT_EXPORTS }