mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Code

qzint build has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2021-02-03 22:00:14 +03:00
parent 87bfa3a170
commit 088a6eadce
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/zint-2.6.1/backend_qt/backend_qt.pro vendored
View File

@ -4,7 +4,7 @@ TEMPLATE = lib
contains(CONFIG, static_build){ contains(CONFIG, static_build){
message(Static Build) message(Static Build)
CONFIG += staticlib CONFIG += staticlib
DEFINES += HAVE_STATIC_BUILD DEFINES += QZINT_STATIC_BUILD
} }
!contains(CONFIG, staticlib){ !contains(CONFIG, staticlib){

6
3rdparty/zint-2.6.1/backend_qt/qzint_global.h vendored
View File

@ -3,14 +3,12 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifdef HAVE_STATIC_BUILD #ifdef QZINT_STATIC_BUILD
# define QZINTSHARED_EXPORT /**/ # define QZINTSHARED_EXPORT /**/
#else #elif QZINT_LIBRARY
#if defined(QZINT_LIBRARY)
# define QZINTSHARED_EXPORT Q_DECL_EXPORT # define QZINTSHARED_EXPORT Q_DECL_EXPORT
#else #else
# define QZINTSHARED_EXPORT Q_DECL_IMPORT # define QZINTSHARED_EXPORT Q_DECL_IMPORT
#endif #endif
#endif
#endif // QZINT_GLOBAL_H #endif // QZINT_GLOBAL_H

1
limereport.pri
View File

@ -1,5 +1,6 @@
CONFIG += zint CONFIG += zint
include(./limereport/limereport.pri) include(./limereport/limereport.pri)
contains(CONFIG, zint){ contains(CONFIG, zint){
DEFINES+=QZINT_STATIC_BUILD
include(./qzint.pri) include(./qzint.pri)
} }

1
limereport/limereport.pro
View File

@ -28,6 +28,7 @@ DEFINES += LIMEREPORT_EXPORTS
contains(CONFIG, staticlib){ contains(CONFIG, staticlib){
DEFINES += HAVE_STATIC_BUILD DEFINES += HAVE_STATIC_BUILD
DEFINES += QZINT_STATIC_BUILD
message(STATIC_BUILD) message(STATIC_BUILD)
DEFINES -= LIMEREPORT_EXPORTS DEFINES -= LIMEREPORT_EXPORTS
} }