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

limereport/limereport.pro

@@ -10,8 +10,15 @@ CONFIG(debug, debug|release) {
 
 TEMPLATE = lib
 
-CONFIG += lib
-CONFIG += dll
+contains(CONFIG, static_build){
+    CONFIG += staticlib
+}
+
+!contains(CONFIG, staticlib){
+    CONFIG += lib
+    CONFIG += dll
+}
+
 CONFIG += create_prl
 CONFIG += link_prl
 
@@ -23,6 +30,12 @@ macx{
 
 DEFINES += LIMEREPORT_EXPORTS
 
+contains(CONFIG, staticlib){
+    DEFINES += HAVE_STATIC_BUILD
+    message(STATIC_BUILD)
+    DEFINES -= LIMEREPORT_EXPORTS
+}
+
 EXTRA_FILES += \
     $$PWD/lrglobal.cpp \
     $$PWD/lrglobal.h \
@@ -83,7 +96,7 @@ contains(CONFIG,zint){
 ####Automatically build required translation files (*.qm)
 
 contains(CONFIG,build_translations){
-    LANGUAGES = ru es_ES ar
+    LANGUAGES = ru es_ES ar fr zh
 
     defineReplace(prependAll) {
         for(a,$$1):result += $$2$${a}$$3