mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-02 19:56:58 +03:00
Code Activity

Merge tag '1.5.80' into develop

Browse Source 
Finish 1.5.80
This commit is contained in:
Arin Alexander
2021-02-17 21:54:26 +03:00
parent 9c22b63de3 f8bdd97679
commit 5da763f728
11 changed files with 77 additions and 10 deletions
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){
message(Static Build)
CONFIG += staticlib
DEFINES += HAVE_STATIC_BUILD
DEFINES += QZINT_STATIC_BUILD
}
!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>
#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