Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport

# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts

3rdparty/zint-2.4.4/backend_qt4/Zint.pro

@@ -1,7 +1,15 @@
 DEFINES += NO_PNG
-
 TEMPLATE = lib
+
+contains(CONFIG, static_build){
+    CONFIG += staticlib
+    DEFINES += HAVE_STATIC_BUILD
+}
+
+!contains(CONFIG, staticlib){
 CONFIG += dll
+    DEFINES += QZINT_LIBRARY
+}
 
 include(../../../common.pri)
 
@@ -18,8 +26,6 @@ unix{
 
 INCLUDEPATH += $$PWD/../backend
 DEFINES +=  _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
-DEFINES += QZINT_LIBRARY
-#TARGET = QtZint
 
 CONFIG(debug, debug|release) {
     TARGET = QtZintd

3rdparty/zint-2.4.4/backend_qt4/qzint_global.h

@@ -3,10 +3,14 @@
 
 #include <QtCore/qglobal.h>
 
+#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